Update and rebuild translations.

41 files changed, 9610 insertions, 9420 deletions

diff --git a/data/translations/help/ru.po b/data/translations/help/ru.po
index 51e8718ca..8998e12b7 100644
--- a/data/translations/help/ru.po
+++ b/data/translations/help/ru.po
@@ -1,13 +1,14 @@
 # en#
 # Translators:
+# Alexandr Uspensky <AlexandrUSP@yandex.com>, 2012.
 # Andrei Karas <akaras@inbox.ru>, 2012.
 #   <BoBaH4spam@ukr.net>, 2012.
 # Dan Sagunov <danilka.pro@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-08-01 15:18+0000\n"
-"Last-Translator: Dan Sagunov <danilka.pro@gmail.com>\n"
+"PO-Revision-Date: 2012-08-11 16:17+0000\n"
+"Last-Translator: Alexandr Uspensky <AlexandrUSP@yandex.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -189,16 +190,16 @@ msgid ""
 msgstr "Вы можете двигаться к Вратам автоматически.\nОткройте окно Общество (F11) и выберите Навигационную панель,\nзатем клик на требуемые Врата."
 
 msgid "##2LeftAlt + 7##P              \"Emote Shortcut 7\""
-msgstr ""
+msgstr "##2LeftAlt + 7##P              \"Эмоция 7\""
 
 msgid "##2LeftShift##P                \"Stop Attack\""
-msgstr ""
+msgstr "##2LeftShift##P \"Остановить атаку\""
 
 msgid "/setdrop N - set drop counter to requested value."
 msgstr "/setdrop N - задать счетчику дропов нужное значение."
 
 msgid "##2LeftAlt + 8##P              \"Emote Shortcut 8\""
-msgstr ""
+msgstr "##2LeftAlt + 8##P              \"Эмоция 8\""
 
 msgid "##2RightWinKey##P              \"Ignore input 2\""
 msgstr ""
@@ -210,7 +211,7 @@ msgid "Visit IRC channel:"
 msgstr "Посетить IRC канал"
 
 msgid "##2LeftAlt + Equals(=)##P      \"Emote Shortcut 12\""
-msgstr ""
+msgstr "##2LeftAlt + Equals(=)##P      \"Эмоция 12\""
 
 msgid "/createparty NAME - create party with selected name."
 msgstr "/createparty "
@@ -253,7 +254,7 @@ msgid "/unignore NICK - Remove nick from ignore list."
 msgstr "/unignore ИГРОК - убрать игрока из списка игнорирования."
 
 msgid "##2LeftAlt + 6##P              \"Emote Shortcut 6\""
-msgstr ""
+msgstr "##2LeftAlt + 6##P              \"Эмоция 6\""
 
 msgid "IGNORING COMMUNICATION"
 msgstr "ИГНОРИРОВАНИЕ"
@@ -268,7 +269,7 @@ msgid "##2LEFT##P                     \"Move Left\""
 msgstr "##2LEFT##P                     \"Двигаться влево\""
 
 msgid "##2LeftAlt + 9##P              \"Emote Shortcut 9\""
-msgstr ""
+msgstr "##2LeftAlt + 9##P              \"Эмоция 9\""
 
 msgid "About"
 msgstr "Об игре"
@@ -291,7 +292,7 @@ msgid ""
 msgstr "Вы можете использовать голосовой чат Mumble для связи с другими игроками.\nЗапустите Mumble перед запуском клиента и включите Mumble в настройках игры."
 
 msgid "##2RightAlt##P                 \"Copy Outfit\""
-msgstr ""
+msgstr "##2RightAlt##P                 \"Копировать костюм\""
 
 msgid "##20##P                        \"Item Shortcut 10\""
 msgstr ""
@@ -305,7 +306,7 @@ msgid "/who - print online players number to chat."
 msgstr "/who - вывести количество пользователей онлайн в чат."
 
 msgid "##2r##P                        \"Enable/Disable Trading\""
-msgstr ""
+msgstr "##2r##P                        \"Разрешить/запретить торговлю\""
 
 msgid "/uptime - show client uptime."
 msgstr "/uptime - показать время работы клиента."
@@ -320,7 +321,7 @@ msgid "/imitation NICK - start imitation mode."
 msgstr "/imitation ИГРОК - начать режим имитации."
 
 msgid "##2LeftAlt + EmoteKey##P       \"Smilie\""
-msgstr ""
+msgstr "##2LeftAlt + EmoteKey##P \"Смайл\""
 
 msgid "##22##P                        \"Item Shortcut 2\""
 msgstr ""
@@ -344,13 +345,13 @@ msgid "Server news"
 msgstr "Новости сервера"
 
 msgid "##2LeftAlt + 4##P              \"Emote Shortcut 4\""
-msgstr ""
+msgstr "##2LeftAlt + 4##P              \"Эмоция 4\""
 
 msgid "Website: http://manaplus.evolonline.org/"
 msgstr "Сайт: http://manaplus.evolonline.org/"
 
 msgid "##2F3##P                       \"Inventory Window\""
-msgstr ""
+msgstr "##2F3##P                       \"Окно инвентаря\""
 
 msgid "ABOUT MANAPLUS"
 msgstr "Об игре MANAPLUS"
@@ -405,7 +406,7 @@ msgid "/addignoreattack NAME - add monster to ignore attack list."
 msgstr "/addignoreattack МОНСТР - добавить монстра в список игнорирования при атаке."
 
 msgid "##2KeyPad[+]##P                \"Toggle camera mode\""
-msgstr ""
+msgstr "##2KeyPad[+]##P                \"Переключить режим камеры\""
 
 msgid "##2Home##P                     \"Item Shortcut 15\""
 msgstr ""
@@ -432,7 +433,7 @@ msgid "##2Tab##P                      \"Chat Auto Complete\""
 msgstr ""
 
 msgid "##2LeftAlt + 5##P              \"Emote Shortcut 5\""
-msgstr ""
+msgstr "##2LeftAlt + 5##P              \"Эмоция 5\""
 
 msgid ""
 " - ##2save player list##P: Should your acquaintance list be saved when you\n"
@@ -459,7 +460,7 @@ msgid "##POther skills can be obtain by doing quests and missions in game."
 msgstr ""
 
 msgid "##2RightControl##P             \"Wear Outfit\""
-msgstr ""
+msgstr "##2RightControl##P             \"Надеть костюм\""
 
 msgid ""
 "You can buy or sell items from players shops.\n"
@@ -467,25 +468,25 @@ msgid ""
 msgstr "Вы можете покупать и продавать предметы\nв пользовательский маназинах.\nНажмите правой кнопкой на пользователе\nи выберите \"Купить\" или \"Продать\""
 
 msgid "/erase NICK - add nick to erased list."
-msgstr ""
+msgstr "/erase ИГРОК - добавить игрока в список стертых."
 
 msgid "/pricesave - save shop price to disc."
-msgstr ""
+msgstr "/pricesave - сохранить цены магазина."
 
 msgid "COMMUNICATION:"
 msgstr "ОБЩЕНИЕ"
 
 msgid "##2SpaceBar##P                 \"Select OK\""
-msgstr ""
+msgstr "##2SpaceBar##P                 \"Select OK\""
 
 msgid "##2Emote:##P enables the ability to express emotions."
-msgstr ""
+msgstr "##2Emote:##P даёт возможность выражать эмоции."
 
 msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr "/friend ИГРОК, /befriend ИГРОК - добавить игрока в список друзей."
 
 msgid "##2i##P                        \"Switch Quick Drop Counter\""
-msgstr ""
+msgstr "##2i##P                        \"Switch Quick Drop Counter\""
 
 msgid ""
 "##2ManaPlus##P is extended client based on old code from ##2Mana##P client.\n"
@@ -500,13 +501,13 @@ msgid ""
 msgstr ""
 
 msgid "##2LeftAlt + 2##P              \"Emote Shortcut 2\""
-msgstr ""
+msgstr "##2LeftAlt + 2##P              \"Эмоция 2\""
 
 msgid "##2F7##P                       \"Chat Window\""
-msgstr ""
+msgstr "##2F7##P                       \"Окно чата\""
 
 msgid "##2LeftAlt + 1##P              \"Emote Shortcut 1\""
-msgstr ""
+msgstr "##2LeftAlt + 1##P              \"Эмоция 1\""
 
 msgid "##2F11##P                      \"Social Window\""
 msgstr "##2F11##P                      \"Окно Общество\""
@@ -630,7 +631,7 @@ msgid "Powered By"
 msgstr "Сделано при помощи"
 
 msgid "/disconnect - quick disconnect from server."
-msgstr ""
+msgstr "/disconnect - быстро отключиться от сервера."
 
 msgid "/disregard NICK - add nick to disregarded list."
 msgstr ""
@@ -645,7 +646,7 @@ msgid "Commands"
 msgstr "Команды"
 
 msgid "/undress NICK - remove all clothes from nick. Local effect only."
-msgstr ""
+msgstr "/undress NICK - снять всю одежду с NICK. Только местное действие."
 
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
@@ -763,13 +764,13 @@ msgid "##2LeftAlt + Backspace##P      \"Emote Shortcut 13\""
 msgstr ""
 
 msgid "##2p##P                        \"Screenshot\""
-msgstr ""
+msgstr "##2p##P \"Скриншот\""
 
 msgid "##2x##P                        \"Target & Attack\""
 msgstr "##2x##P                        \"Выбрать цель и атаковать\""
 
 msgid "##2b##P                        \"Use magic attack\""
-msgstr ""
+msgstr "##2b##P \"Использовать магическую атаку\""
 
 msgid "##2KeyPad[4]##P                \"Change Imitation mode\""
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 75ccbfaa0..35be3c119 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "تثبيت"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "مرئية"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "خطأ"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,12 +257,12 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -273,7 +273,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -284,7 +284,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -295,7 +295,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -306,7 +306,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -317,27 +317,27 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -354,19 +354,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -421,50 +421,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -477,13 +477,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "بيع"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -496,7 +496,7 @@ msgstr "بيع"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -602,7 +602,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "إنشاء"
 
@@ -617,7 +617,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -676,9 +676,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "حذف"
@@ -757,7 +757,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -951,26 +951,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -996,7 +996,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1049,8 +1053,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "استعمال العتاد"
 
@@ -1380,12 +1384,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1395,7 +1399,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1539,7 +1543,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1654,7 +1658,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1735,11 +1739,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1795,46 +1799,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "إضافة"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2377,7 +2377,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2605,46 +2605,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2660,27 +2660,27 @@ msgstr "تصفير النوافذ"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2860,106 +2860,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3287,97 +3291,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "ملء الشاشة"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "مؤشّر مخصّص"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3501,31 +3505,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3576,219 +3580,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3941,24 +3945,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "تغيير"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4150,7 +4154,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4162,11 +4166,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5749,15 +5753,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index bfb435c6a..dae8347f2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr ""
 
@@ -597,7 +597,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr ""
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1352,12 +1356,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index bcca94590..38a63d093 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "sortir"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr ""
 
@@ -597,7 +597,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr ""
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1352,12 +1356,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "canvi"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index d399a03bc..38308cfff 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-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
 "cs/)\n"
@@ -29,7 +29,7 @@ msgstr "Ignorovat příchozí žádosti o obchodování"
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
@@ -37,117 +37,117 @@ msgstr "Viditelný na mapě"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "úskočil"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Výkon"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Změna hesla"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Změna emailu"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Neplatný host updatů: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, 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."
@@ -262,12 +262,12 @@ msgstr "Hráč byl úspěšně vymazán!"
 msgid "Player could not be erased!"
 msgstr "Hráč nemůže být vymazán!"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -275,7 +275,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -283,7 +283,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -291,7 +291,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -299,7 +299,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -307,27 +307,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "velikost chache fontů"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Velikost cache:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Vytvořeno:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Odstraněno:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -344,19 +344,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Snímky obrazovky ukládat jako "
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Chyba sítě"
 
@@ -411,50 +411,50 @@ msgstr ""
 msgid "Result"
 msgstr "Výsledek"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Vynulovat"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s / Celkem %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -467,13 +467,13 @@ msgstr "Obchod"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Prodej"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -486,7 +486,7 @@ msgstr "Prodej"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -592,7 +592,7 @@ msgid "Race:"
 msgstr "Rasa:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -607,7 +607,7 @@ msgstr "Žena"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Ostatní"
 
@@ -666,9 +666,9 @@ msgstr "Zadej heslo pro smazání postavy"
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Smazat"
@@ -747,7 +747,7 @@ msgstr "duhová 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -941,26 +941,26 @@ msgstr "Odchozí: %d bytes/s"
 msgid "Did You Know?"
 msgstr "Víte že ... ?"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Předchozí"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Další >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Automaticky otevírat toto okno"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -986,7 +986,11 @@ msgstr "Typ serveru:"
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Připojit"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1039,8 +1043,8 @@ msgid "Filter:"
 msgstr "Filtr:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Vybavit"
 
@@ -1364,12 +1368,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Výstroj: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1379,7 +1383,7 @@ msgstr "Klávesa: %s"
 msgid "Unequip first"
 msgstr "Nejdřív odstrojit"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Výstroj pro \"Away\""
 
@@ -1523,7 +1527,7 @@ msgstr "Zapnout \"away\""
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Odejít"
 
@@ -1638,7 +1642,7 @@ msgstr "Zkopírovat do chatu"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1719,11 +1723,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1779,46 +1783,42 @@ msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
 msgid "Use same ip for game sub servers"
 msgstr "Použít stejnou IP pro herní sub servery"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Načíst"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Připojit"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Přidat"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Upravit"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Stahuji seznam serverů...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Čekám na odezvu serveru..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Připravuji stažení"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Chyba při získávání seznamu serverů!"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "potřebuje novější verzi"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "potřebuje v%s"
@@ -2361,7 +2361,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "Zkratky"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2589,46 +2589,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Takhle to bude vypadat"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statický"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulzní"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Duhový"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Prodleva:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Červená:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Zelená:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Modrá:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Průhlednost:"
 
@@ -2644,27 +2644,27 @@ msgstr "Resetovat okna"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Přiřadit"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Odebrat"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Kolize kláves detekovány."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2846,106 +2846,110 @@ msgid "Enable shop mode"
 msgstr "Zapnout mód obchodu"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Zaznamenávat dialogy s NPC"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "Podpora botů"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "Zapnout podporu AuctionBot-a"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Zapnout podporu guild bota a vypnout nativní podporu gild"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Zapnout ověřovač botů"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Zapnout debug záznam"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "Mód nízké síťvé náročnosti"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "Skrýt zobrazení štítu"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Zobrazit pozadí"
 
@@ -3273,100 +3277,100 @@ msgstr ""
 msgid "Theme Changed"
 msgstr "Téma změněno"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Restartujte klient pro aplikováni změn."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Softwarový"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "Rychlé OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "Bezpečné OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Celá obrazovka"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Vlastní kurzor"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "Omezení FPS:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Altern. FPS omezení:"
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Žádné"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 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:377
+#: src/gui/setup_video.cpp:370
 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:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Přepínám na celou obrazovku"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Pro uplatnění změn je potřeba restart."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Měním na OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Změny v OpenGL vyžadují restart."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Vlastní rozlišení (příklad: 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Zadej nové rozlišení:"
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Rozlišení obrazovky změněno"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 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."
 
@@ -3490,31 +3494,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr "Osobní obchod"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Koupit věci"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Prodat věci"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Oznámit"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Zobrazit odkazy v oznámení"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "Aukce"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Požadavek k obchodování"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s %s příjímáte?"
@@ -3565,219 +3569,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Gilda"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pozvali jste %s do gildy %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Požadován odchod z gildy %s."
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "Člen pozval do gildy"
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Koho byste rád pozval do gildy %s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Opustit gildu?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Jste si jisti že chcete opustit gildu %s?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Parta"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "Prioritní monstra"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "Útočit na monstra"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Ignorovat monstra"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Vytvořit gildu"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Vytvořit partu"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Společenství"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Pozvat"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Vytvářím gildu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Vytvářím partu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Název gildy"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Zvolte jméno vaší gildy."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vás zve ke vstupu do gildy %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "Byli jste pozváni k připojení se do party."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Byli jste pozváni k připojení se do party %s."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vás pozval ke vstupu do své party."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Jméno party"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
@@ -3930,24 +3934,24 @@ msgstr "Odsouhlaseno. Čekám..."
 msgid "Trade: You"
 msgstr "Obchod: Ty"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Dostaneš: %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Dáváš:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Změnit"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Nemáte dost peněz."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -4138,7 +4142,7 @@ msgstr "Hranice domácího místa"
 msgid "Road Point"
 msgstr "Bod cesty"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
@@ -4150,11 +4154,11 @@ msgstr "Obnovit"
 msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5740,15 +5744,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index ddaf52cd8..0e39bcacc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/manaplus/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Ignorerer indkomne handels anmodninger"
 msgid "Accepting incoming trade requests"
 msgstr "Accepterer indkomne handels anmodninger"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -35,117 +35,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Forbinder til server"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Logger ind"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Fejl"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -258,67 +258,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -335,19 +335,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Netværksfejl"
 
@@ -402,50 +402,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Nulstil"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Køb"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Total: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -458,13 +458,13 @@ msgstr "butik"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Sælg"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -477,7 +477,7 @@ msgstr "Sælg"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -583,7 +583,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Opret"
 
@@ -598,7 +598,7 @@ msgstr "Kvinde"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -657,9 +657,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Slet"
@@ -738,7 +738,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -932,26 +932,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Luk"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -977,7 +977,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1030,8 +1034,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Tag på"
 
@@ -1353,12 +1357,12 @@ msgstr "Send"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kunne ikke sende brevet. Afsender eller brev er ugyldigt."
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1368,7 +1372,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1512,7 +1516,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1627,7 +1631,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1708,11 +1712,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1768,46 +1772,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2350,7 +2350,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2578,46 +2578,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Sådan ser farven ud."
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Fastlåst"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulserende"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Regnbuefarvet"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2633,27 +2633,27 @@ msgstr "Nulstil Vinduer"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Tildel"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Standard"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Tast Konfikt(er) Opdaget."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2833,106 +2833,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3260,97 +3264,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Fuld Skærm"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Brugerdefineret cursor"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3474,31 +3478,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Anmodning om byttehandel."
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3549,219 +3553,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3914,24 +3918,24 @@ msgstr "Godkendt. Venter..."
 msgid "Trade: You"
 msgstr "Handel: Dig"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Du giver:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Ændre"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Du har ikke penge nok."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på vinduet."
@@ -4123,7 +4127,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4135,11 +4139,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5718,15 +5722,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index ee79da698..645b7753a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
@@ -36,7 +36,7 @@ msgstr "Ignoriere eingehende Handelsanfragen"
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Sichtbar auf der Karte"
 
@@ -44,117 +44,117 @@ msgstr "Sichtbar auf der Karte"
 msgid "Human"
 msgstr "Mensch"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Leistung"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "Themen"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Passwort ändern"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komm jeder Zeit wieder..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, 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:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -270,67 +270,67 @@ msgstr "Spieler erfolgreich gelöscht!"
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "Schrift-Cache Größe"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Cache-Größe:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Erstellt:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Gelöscht:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
@@ -348,19 +348,19 @@ msgstr "Allgemein"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto gespeichert unter "
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
@@ -415,50 +415,50 @@ msgstr "Bewegen"
 msgid "Result"
 msgstr "Resultat"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Zurücksetzten"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Kaufen"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preis: %s / Gesamt: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr "Menge:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -471,13 +471,13 @@ msgstr "Laden"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Verkaufen"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -490,7 +490,7 @@ msgstr "Verkaufen"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -596,7 +596,7 @@ msgid "Race:"
 msgstr "Rasse:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Erstellen"
 
@@ -611,7 +611,7 @@ msgstr "Weiblich"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Sonstig"
 
@@ -670,9 +670,9 @@ msgstr "Gib dein Passwort ein, um den Charakter zu löschen"
 msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Löschen"
@@ -751,7 +751,7 @@ msgstr "Regenbogen 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -945,26 +945,26 @@ msgstr "Ausgehend: %d bytes/s"
 msgid "Did You Know?"
 msgstr "Wusstest du schon?"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Zurück"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Vor >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Öffne dieses Fenster automatisch"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -990,7 +990,11 @@ msgstr "Server Typ:"
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Verbinde..."
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
@@ -1043,8 +1047,8 @@ msgid "Filter:"
 msgstr "Filter:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Ausrüsten"
 
@@ -1368,12 +1372,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Ausrüstung: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1383,7 +1387,7 @@ msgstr "Taste: %s"
 msgid "Unequip first"
 msgstr "Zuerst ausziehen"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Abwesend-Outfit"
 
@@ -1527,7 +1531,7 @@ msgstr "Aktiviere abwesend"
 msgid "Disable away"
 msgstr "Deaktiviere abwesend"
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Verlassen"
 
@@ -1642,7 +1646,7 @@ msgstr "Kopiere zu Chat"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(normal)"
 
@@ -1723,11 +1727,11 @@ msgstr "Von der Aufhebeliste entfernen"
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -1783,46 +1787,42 @@ msgstr "Wähle einen Server  ***SICHERER MODUS ***"
 msgid "Use same ip for game sub servers"
 msgstr "Benutze die selbe IP auf Zweitservern des Spiels"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Laden"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Verbinde..."
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Ändern"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Fehler beim Empfangen der Serverliste!"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -2365,7 +2365,7 @@ msgstr "Normal"
 msgid "Shortcuts"
 msgstr "Tastenkürzel"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr "Fenster"
 
@@ -2593,46 +2593,46 @@ msgstr "Zeige MVP-Mitteilungen"
 msgid "This is what the color looks like"
 msgstr "So sieht die Farbe aus"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulsierend"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Regenbogen"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Verzögerung:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Rot:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Grün:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Blau:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -2648,27 +2648,27 @@ msgstr "Fenster zurücksetzen"
 msgid "Input"
 msgstr "Eingabe"
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Zuordnen"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Zurücksetzen"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr "Zürücksetzen aller Tastenbelegungen"
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Standard"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Wiedersprüchliche Tasteneinstellung(en) entdeckt"
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2850,106 +2850,110 @@ msgid "Enable shop mode"
 msgstr "Laden-Modus einschalten"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Protokolliere NPC Dialoge"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "Bot Unterstützung"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "Aktiviere Auktion-Bot Unterstützung"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Erlaube Gilden-Bot und deaktiviere nativen Gilden-Support"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr "Wiederholverzögerung"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr "Wiederholungszeitraum"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr "Immer zeigen"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr "Automatisch ausblenden bei kleiner Auflösung"
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr "Immer Automatisch ausblenden"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr "Kurzwahltasten"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr "Proxy Server"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr "System proxy"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr "Direkte Verbindung"
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 hostname"
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr "Proxy type"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr "Proxy address:port"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "Aktiviere Angriff trotz Verzögerung"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Botprüfer einschalten"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Aktiviere Schutz bei fehlerhaften-Servern (nicht deaktivieren)"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Debug-Protokoll benutzen"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "Niedriger Datenverkehr Modus"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "Zeige das Schild nicht an"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Benutze FBO für Bildschirmfotos (nur für openGL)"
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr "Netzwerkverzögerung zwischen Unterservern"
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Zeige Hintergrund"
 
@@ -3280,103 +3284,103 @@ msgstr ""
 msgid "Theme Changed"
 msgstr "Theme geändert"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu, um die Änderungen zu übernehmen."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "Schnelles OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "Sicheres OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr "Erlaube Größenanpassung"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr "Kein Fensterrahmen"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Alt FPS Limit:"
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr "besten Modus ermitteln"
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Kein(e)"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 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:377
+#: src/gui/setup_video.cpp:370
 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:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Wechsle zu OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Benutzerdefinierte Auflösung (zum Beispiel: 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Neue Auflösung eingeben:"
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Bildschirmauflösung wurde geändert"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 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 "
@@ -3502,31 +3506,31 @@ msgstr "Spielfenster zentrieren"
 msgid "Personal Shop"
 msgstr "Persönlicher Laden"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Kaufe Dinge"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Verkaufe Dinge"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Teile mit"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Zeige Links in Ankündigung"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "Auktion"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s möchte %s %s akzeptierst du?"
@@ -3577,220 +3581,220 @@ msgstr "Lvl: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Lvl: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Gilde"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "%s in die Gilde %s einladen."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Gilde %s Ausstieg angefragt,"
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "Lade Mitglied in die Gilde ein."
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wen willst du in die Gilde %s einladen?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Gilde verlassen?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist du sicher, dass du die Gilde %s verlassen willst?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "%s zur Gruppe einladen."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Gruppe %s Auflösung beauftragt."
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "Lade Mitglied in die Gruppe ein."
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wen willst du zur Gruppe %s einladen?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "Gruppe verlassen?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist du sicher, dass du die Gruppe %s verlassen willst?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "Bevorzugte Monster"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "Greife Monster an"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Ignoriere Monster"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr "Pik"
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr "Gegenstände aufheben"
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr "Gegenstände ignorieren"
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Gruppe erstellen"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Sozial"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr "F"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Gruppeneinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Gruppeneinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Gildeneinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Gildeneinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle die Gruppe \"%s\""
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Gildenname"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Gruppe erhalten, es wurde schon einmal angefragt."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 "Anfrage für eine Gruppe erhalten, aber du bist bereits in einer Gruppe."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "Du wurdest zu einer Gruppe eingeladen."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du wurdest zu der Gruppe %s eingeladen."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Gruppe eingeladen."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Gruppe %s teilzunehmen."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Nehme Gruppeneinladung an"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "Konnte keine Gruppe erstellen. Du bist schon in einer Gruppe."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Gruppenname"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Name deiner Gruppe wählen."
 
@@ -3943,24 +3947,24 @@ msgstr "Zugestimmt. Warten..."
 msgid "Trade: You"
 msgstr "Handel: Du"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Du bekommst %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Ändern"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
@@ -4153,7 +4157,7 @@ msgstr "Stammplatz Grenze"
 msgid "Road Point"
 msgstr "Wegpunkt"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Wer ist Online - Aktualisiere"
 
@@ -4165,11 +4169,11 @@ msgstr "Aktualisierung"
 msgid "Who Is Online - "
 msgstr "Wer ist Online "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Wer ist Online - Fehler"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "Wer ist Online - Aktualisiere"
 
@@ -5778,15 +5782,15 @@ msgstr "Angriffsreichweite"
 msgid "Damage per sec."
 msgstr "Schaden pro Sek."
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Empty address given to Network::connect()!"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "Nicht möglich den host \" aufzulösen"
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "Verbindung mit Server abgebrochen."
 
diff --git a/po/el.po b/po/el.po
index 1b6598ea9..0a4b16c6d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:26+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/manaplus/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr "Αποδεχόμενος τα εισερχόμενα αιτήματα του εμπορίου"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "υπευκφυγή"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "αστοχία"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Ρύθμισεις"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Σύνδεση σε τονδιακομιστή"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Σύνδεση"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Μπαίνοντας στον κόσμο του παιχνιδιού "
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Αναζητώντας χαρακτήρες"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Σύνδεση με τον διακομιστή του παιχνιδιού"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Αναζητούνται τα στοιχεία της εγγραφής"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Ο κωδικός σας άλλαξε με επιτυχία!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Αλλαγή ηλεκτρονικού ταχυδρομείου"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "Ηλεκτρονικό ταχυδρομείο άλλαξε με επιτυχία!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Διαγραφή Επιτυχής"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Αντίο, να επιστρέψεις κάθε στιγμή ..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr " %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί!Έξοδος."
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Άκυρα ενημέρωση υποδοχής: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Σφάλμα κατά τη δημιουργία του καταλόγου ενημερώσεων!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Σφάλμα: %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί! Εγκατάλειψη."
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr "Γενικά"
 msgid "Debug"
 msgstr "Αποσφαλμάτωση"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Φωτογραφία αποθηκεύτηκε ως"
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Σώσιμο φωτογραφίας απέτυχε"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "Η σύνδεση με το διακομιστή χάθηκε."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Σφάλμα δικτύου"
 
@@ -401,50 +401,50 @@ msgstr "Κίνηση"
 msgid "Result"
 msgstr "Αποτέλεσμα"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Επαναφορά"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Αγορά"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr "Κατάστημα"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Πουλήστε"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr "Πουλήστε"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Δημιουργία"
 
@@ -597,7 +597,7 @@ msgstr "Γυναίκα"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Διαγραφή"
@@ -737,7 +737,7 @@ msgstr "ουράνιο τόξο 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr "Φίλτρο:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Equip"
 
@@ -1352,12 +1356,12 @@ msgstr "Αποστολή"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr "Κλειδί: %s"
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Πληκτρολογήστε το νέα ανάλυση:"
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Ανάλυση οθόνης Άλλαξε"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Μερικά παράθυρα μπορούν να μετακινούνται για να ταιριάξει στην χαμηλότερη ανάλυση."
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr "Προσωπικό Μαγαζί"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Πουλήστε αντικείμενα"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Εμφάνιση συνδέσμων στις ανακοινώσεις"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index e042959e3..2de9c3195 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Ignoring incoming trade requests"
 msgid "Accepting incoming trade requests"
 msgstr "Accepting incoming trade requests"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -35,117 +35,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "dodge"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Setup"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Connecting to server"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Logging in"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Entering game world"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Requesting characters"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Connecting to the game server"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Changing game servers"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Requesting registration details"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Password Change"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -258,67 +258,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -335,19 +335,19 @@ msgstr "General"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Network Error"
 
@@ -402,50 +402,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Price: %s / Total: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -458,13 +458,13 @@ msgstr "Shop"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Sell"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -477,7 +477,7 @@ msgstr "Sell"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -583,7 +583,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Create"
 
@@ -598,7 +598,7 @@ msgstr "Female"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -657,9 +657,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Delete"
@@ -738,7 +738,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -932,26 +932,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Close"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -977,7 +977,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1030,8 +1034,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Equip"
 
@@ -1353,12 +1357,12 @@ msgstr "Send"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Failed to send as sender or letter invalid."
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1368,7 +1372,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1512,7 +1516,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1627,7 +1631,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1708,11 +1712,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1768,46 +1772,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Add"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2350,7 +2350,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2578,46 +2578,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "This is what the colour looks like"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Static"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulse"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Rainbow"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2633,27 +2633,27 @@ msgstr "Reset Windows"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Assign"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Default"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Key Conflict(s) Detected."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2833,106 +2833,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3260,97 +3264,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Restart your client for the change to take effect."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Full screen"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Custom cursor"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3474,31 +3478,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Request for Trade"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3549,219 +3553,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Create Guild"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3914,24 +3918,24 @@ msgstr "Agreed. Waiting..."
 msgid "Trade: You"
 msgstr "Trade: You"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "You give:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Change"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "You don't have enough money."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Failed adding item. You can not overlap one kind of item on the window."
@@ -4123,7 +4127,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4135,11 +4139,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5718,15 +5722,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/eo.po b/po/eo.po
index 3e56885b1..5c7f4d941 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr ""
 
@@ -597,7 +597,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr ""
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1352,12 +1356,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index e738a6c4b..5c4cc0d06 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
@@ -33,7 +33,7 @@ msgstr "Ignorando las peticiones de intercambio"
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
@@ -41,117 +41,117 @@ msgstr "Visible sobre el mapa"
 msgid "Human"
 msgstr "Humano"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, 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:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, 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."
@@ -266,67 +266,67 @@ msgstr "¡Jugador borrado con éxito!"
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "tamaño de caché de fuente"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Tam. caché:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Creado:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Borrado:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
@@ -344,19 +344,19 @@ msgstr "General"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Error de Red"
 
@@ -411,50 +411,50 @@ msgstr "Mover"
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Restablecer"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Precio: %s / Total: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr "Cantidad:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -467,13 +467,13 @@ msgstr "Tienda"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Vender"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -486,7 +486,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -596,7 +596,7 @@ msgid "Race:"
 msgstr "Race:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Crear"
 
@@ -611,7 +611,7 @@ msgstr "Femenino"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Otro"
 
@@ -670,9 +670,9 @@ msgstr "Ingrese la contraseña para borrar el personaje"
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Borrar"
@@ -751,7 +751,7 @@ msgstr "arco iris 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -945,26 +945,26 @@ msgstr "Enviando: %d bytes/s"
 msgid "Did You Know?"
 msgstr "¿Sabías que...?"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Previo"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Siguiente >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Abrir automáticamente esta ventana"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -990,7 +990,11 @@ msgstr "Tipo de servidor:"
 msgid "Description:"
 msgstr "Descripción:"
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Conectar"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 "Por favor, por lo menos especifique el nombre y el puerto del servidor."
@@ -1044,8 +1048,8 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Equipar"
 
@@ -1367,12 +1371,12 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Fallo al enviar o mensaje inválido."
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Conjuntos: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1382,7 +1386,7 @@ msgstr "Tecla: %s"
 msgid "Unequip first"
 msgstr "Quitárselo antes"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Conjunto para modo AFK"
 
@@ -1526,7 +1530,7 @@ msgstr "Habilitar ausencia"
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Dejar"
 
@@ -1641,7 +1645,7 @@ msgstr "Copiar al chat"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1722,11 +1726,11 @@ msgstr "Remover de lista de recogido"
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr "Desconocido"
 
@@ -1784,46 +1788,42 @@ msgstr "Elige tu servidor  *** MODO SEGURO ***"
 msgid "Use same ip for game sub servers"
 msgstr "Usar el mismo ip para los subservidores del juego"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Cargar"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Conectar"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Añadir"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Editar"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "¡Error al recuperar la lista de servidores!"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "requiere una versión mas nueva"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -2366,7 +2366,7 @@ msgstr "Basico"
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr "Ventanas"
 
@@ -2596,46 +2596,46 @@ msgstr "Mostrar mensajes MVP"
 msgid "This is what the color looks like"
 msgstr "Sostener el teclado y del ratón dentro de la ventana"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Estático"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulso"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Arco iris"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Rojo:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Verde:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Azul:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -2651,27 +2651,27 @@ msgstr "Restaurar Ventanas"
 msgid "Input"
 msgstr "Entrada"
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Atribuir"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Retirar"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr "Restablecer todas las teclas"
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicto de teclas detectado."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2853,106 +2853,110 @@ msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Registro de diálogo de NPC"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "Soporte de bots"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "Habilitar soporte para auction bot"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Habilitar soporte de bot clan y deshabilitar soporte de clan nativo"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr "Retraso en repeticion"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr "Intervalo de Repeticion"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr "Siempre mostrar"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr "Auto  hide en peque"
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr "Siempre auto hide"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr "Atajos"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr "Proxy Server"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr "Proxy del Sistema"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr "Conexion directa"
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 hostname"
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr "Tipo de proxy"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr "Direccion: puerto"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "Habilitar el ataque del lado del servidor"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Habilitar el control de bot"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activar la protección de servidores con errores (no deshabilitar)"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite protector"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Usar FBO para capturas de pantalla (sólo para opengl)"
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr "Retraso de red entre sub servidores"
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Mostrar fondo"
 
@@ -3281,100 +3285,100 @@ msgstr "Tamaño de letra en NPC"
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el juego para que los cambios tengan efecto."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "OpenGL Rápido"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "OpenGL Seguro"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr "Permitir cambiar de tamaño"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr "Sin marco"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "Límite FPS:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Límite FPS alternativo: "
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr "Detectar el mejor modo"
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Nada"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 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:377
+#: src/gui/setup_video.cpp:370
 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:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:                "
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
@@ -3498,31 +3502,31 @@ msgstr "Centralizar ventana"
 msgid "Personal Shop"
 msgstr "Tienda personal"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Comprar artículos"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Vender artículos"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Anunciar"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Mostrar enlaces en anuncio"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "Subasta"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
@@ -3573,219 +3577,219 @@ msgstr "Nivel: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nivel: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Clan"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Invita al jugador %s al clan %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Clan %s pidiendo salir."
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "Miembro invitado al clan."
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "A quién te gustaría invitar al clan %s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "¿Dejar el clan?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "¿Estás seguro de dejar el clan %s?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Jugador %s invitado al grupo."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Grupo %s requisitado."
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "Invitación de un miembro al grupo"
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "¿A quién te gustaría invitar al grupo %s?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "¿Dejar grupo?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "¿Estás seguro de que quieres dejar el grupo %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "Navegación"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Ataque"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "Criaturas prioritarias"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "Criaturas atacadas"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Criaturas ignoradas"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr "Pik"
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr "Recoger Items"
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr "Ignorar Items"
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Crear Clan"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Crear grupo"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al clan de  %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al clan de %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando clan llamado %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Nombre del clan"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Escoge el nombre de tu clan."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del clan, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado al clan %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al clan"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "Fuiste invitado a un grupo."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Has sido invitado para unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te ha invitado a unirte a su grupo."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te ha invitado para unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "No se pudo crear un grupo. Ya estás en uno."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Escoge el nombre del grupo."
 
@@ -3938,24 +3942,24 @@ msgstr "Aceptado. Esperando..."
 msgid "Trade: You"
 msgstr "Intercambio: Tú"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Tú recibes %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Tú das:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Cambiar"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "No tienes dinero suficiente."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
@@ -4148,7 +4152,7 @@ msgstr "Limites de Lugar de Inicio"
 msgid "Road Point"
 msgstr "Mostrar camino"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
@@ -4160,11 +4164,11 @@ msgstr "Actualizar"
 msgid "Who Is Online - "
 msgstr "Quienes están conectados - "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
@@ -5771,15 +5775,15 @@ msgstr "Alcance de Ataque"
 msgid "Damage per sec."
 msgstr "Daño por segundo."
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "¡Dirección vacía enviada a Network::connect()!"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "No es posible determinar el host \""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "Conexión al servidor terminada. "
 
diff --git a/po/et.po b/po/et.po
index 69232d111..44b8ecfb7 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Viga"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr ""
 
@@ -597,7 +597,7 @@ msgstr "Naine"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Kustuta"
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Sulge"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1352,12 +1356,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index 76fac0824..3ddd635a6 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "خطا"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,62 +257,62 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -329,19 +329,19 @@ msgstr "کلی"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "خطای شبکه"
 
@@ -396,50 +396,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "خروج"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -452,13 +452,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -471,7 +471,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -577,7 +577,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "بساز"
 
@@ -592,7 +592,7 @@ msgstr "زن"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -651,9 +651,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "حذف"
@@ -732,7 +732,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -926,26 +926,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -971,7 +971,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1024,8 +1028,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1345,12 +1349,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1360,7 +1364,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1504,7 +1508,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1619,7 +1623,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1700,11 +1704,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1760,46 +1764,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2570,46 +2570,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2625,27 +2625,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2825,106 +2825,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3252,97 +3256,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3466,31 +3470,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3541,219 +3545,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3906,24 +3910,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4115,7 +4119,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4127,11 +4131,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5709,15 +5713,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index c76a833c5..6644c3672 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-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -27,7 +27,7 @@ msgstr "Et huomioi kaupankäyntipyyntöjä"
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
@@ -35,117 +35,117 @@ msgstr "Näkyvillä kartalla"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "-"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Tehokkuus"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Kuva"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "Teemat"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, 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:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, 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."
@@ -260,67 +260,67 @@ msgstr "Pelaaja pyyhitty."
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikon"
 msgstr[1] "%d viikkoa"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivän"
 msgstr[1] "%d päivää"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunnin"
 msgstr[1] "%d tuntia"
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutin"
 msgstr[1] "%d minuuttia"
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunnin"
 msgstr[1] "%d sekuntia"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "kirjasinvälimuistin koko"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Välimuistin koko:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Luotu:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Poistettu:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
@@ -339,19 +339,19 @@ msgstr "Yleiset"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
@@ -406,50 +406,50 @@ msgstr "Liiku"
 msgid "Result"
 msgstr "Tulos"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Hinta: %s / Kaikkiaan: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr "Määrä:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -462,13 +462,13 @@ msgstr "Kauppa"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Myy"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -481,7 +481,7 @@ msgstr "Myy"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -587,7 +587,7 @@ msgid "Race:"
 msgstr "Rotu: "
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Luo"
 
@@ -602,7 +602,7 @@ msgstr "Naispuolinen"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Muu"
 
@@ -661,9 +661,9 @@ msgstr "Anna salasana hahmon poistamiseksi"
 msgid "Enter password:"
 msgstr "Salasana:"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Poista"
@@ -742,7 +742,7 @@ msgstr "sateenkaari 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -936,26 +936,26 @@ msgstr "Ulos: %d tavua/s"
 msgid "Did You Know?"
 msgstr "Tiesitkö?"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Sulje"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Edellinen"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Seuraava >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Avaa tämä ikkuna automaattisesti"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -981,7 +981,11 @@ msgstr "Palvelintyyppi:"
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Yhdistä"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1034,8 +1038,8 @@ msgid "Filter:"
 msgstr "Suodin:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Ota käyttöön"
 
@@ -1357,12 +1361,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Asu: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1372,7 +1376,7 @@ msgstr "Näppäin: %s"
 msgid "Unequip first"
 msgstr "Riisu ensin"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Poissaoloasu"
 
@@ -1516,7 +1520,7 @@ msgstr "Ota poissaolo käyttöön"
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Eroa"
 
@@ -1631,7 +1635,7 @@ msgstr "Kopioi keskusteluun"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1712,11 +1716,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1772,46 +1776,42 @@ msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Yhdistä"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -2354,7 +2354,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2582,46 +2582,46 @@ msgstr "Näytä MVP-viestit"
 msgid "This is what the color looks like"
 msgstr "Väri näyttää tältä"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Staattinen"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Sykkivä"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Sateenkaari"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spektri"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Viive:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Punainen:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Vihreä:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Sininen:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -2637,27 +2637,27 @@ msgstr "Palauta ikkunoiden oletusasetukset"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Aseta"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Poista asetus"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Oletus"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2839,106 +2839,110 @@ msgid "Enable shop mode"
 msgstr "Ota kauppatila käyttöön"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "Bottien tuki"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "Ota käyttöön huutokauppabotin tuki"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ota käyttöön kiltabottien tuki ja poista sisäinen kiltatuki käytöstä"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Ota käyttöön bugisten palvelinten suojaus (älä poista käytöstä)"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "Piilota kilpihahmo"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Näytä tausta"
 
@@ -3267,97 +3271,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Ei kiihdytystä"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "Nopea OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "Turvallinen OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (FPS):"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin:"
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "-"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 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:377
+#: src/gui/setup_video.cpp:370
 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:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Oma tarkkuus (esim. 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Anna uusi tarkkuus:                  "
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
@@ -3482,31 +3486,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr "Oma kauppa"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Osta tavaroita"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Myy tavaroita"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Ilmoita"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Näytä linkit ilmoituksessa"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "Huutokauppa"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s haluaa %s %s - hyväksytkö?"
@@ -3557,219 +3561,219 @@ msgstr "Taso: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Taso: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Kilta"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Kutsuit käyttäjän %s kiltaan %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Killasta %s eroa pyydetty."
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "Jäsenen kutsuminen kiltaan"
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kenet haluaisit kutsua kiltaan %s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Eroa killasta?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti erota killasta %s?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Ryhmä"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Käyttäjä %s kutsuttu ryhmään."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Ryhmästä %s eroamista pyydetty."
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "Jäsenen kutsuminen ryhmään"
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kenet haluaisit kutsua ryhmään %s?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "Eroa ryhmästä?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti erota ryhmästä %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Hyö"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "Priorisoidut kohteet"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "Hyökkäyskohteet"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Ohitettavat kohteet"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Luo kilta"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Suhteet"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Kutsu"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Killan nimi"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
@@ -3922,24 +3926,24 @@ msgstr "Hyväksytty. Odotetaan..."
 msgid "Trade: You"
 msgstr "Kauppa: Sinä"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Saat %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Annat:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Muuta"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
@@ -4130,7 +4134,7 @@ msgstr "Kotipaikan raja"
 msgid "Road Point"
 msgstr "Väyläpiste"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
@@ -4142,11 +4146,11 @@ msgstr "Päivitä"
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -5743,15 +5747,15 @@ msgstr "Hyökkäyskantama"
 msgid "Damage per sec."
 msgstr "Vahinko sekunnissa."
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Tyhjä osoite Network::connect()-pyynnössä!"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "Osoitetta ei löydy: \""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "Yhteys palvelimeen katkaistu. "
 
diff --git a/po/fr.po b/po/fr.po
index b0b9773f0..ed737e8ad 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
@@ -34,7 +34,7 @@ msgstr "Ignorer les requêtes d'échanges entrantes"
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
@@ -42,117 +42,117 @@ msgstr "Visible sur la carte"
 msgid "Human"
 msgstr "Humain"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "esquivé"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "Thèmes"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, 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:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -269,67 +269,67 @@ msgstr "Joueur éliminé avec succès !"
 msgid "Player could not be erased!"
 msgstr "le joueur n'a pas pu être effacé !"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d secondes"
 msgstr[1] "%d secondes"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "Taille du cache de polices"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Dimension du cache :"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Créé : "
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Effacé :"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
@@ -347,20 +347,20 @@ msgstr "Général"
 msgid "Debug"
 msgstr "Débogage"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 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:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
@@ -415,50 +415,50 @@ msgstr "Déplacement"
 msgid "Result"
 msgstr "Résultat"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Acheter"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prix : %s / Total : %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr "Montant:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -471,13 +471,13 @@ msgstr "Boutique"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Vendre"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -490,7 +490,7 @@ msgstr "Vendre"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -596,7 +596,7 @@ msgid "Race:"
 msgstr "Race:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Créer"
 
@@ -611,7 +611,7 @@ msgstr "Féminin"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Autre"
 
@@ -670,9 +670,9 @@ msgstr "Entrer le mot de passe pour effacer le personnage"
 msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Supprimer"
@@ -751,7 +751,7 @@ msgstr "arc en ciel 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -945,26 +945,26 @@ msgstr "Sortie : %d bytes/s"
 msgid "Did You Know?"
 msgstr "Le saviez-vous ?"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Précédent"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Suivant >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Ouverture automatique de cette fenêtre"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -990,7 +990,11 @@ msgstr "Type de Serveur :"
 msgid "Description:"
 msgstr "Description :"
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Connexion..."
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr "Entrez au moins l'adresse et le port du serveur."
 
@@ -1043,8 +1047,8 @@ msgid "Filter:"
 msgstr "Filtre :"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Équiper"
 
@@ -1366,12 +1370,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Tenue : %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1381,7 +1385,7 @@ msgstr "Touche : %s"
 msgid "Unequip first"
 msgstr "Retirer d'abord l'équipement"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Équipement en absence"
 
@@ -1525,7 +1529,7 @@ msgstr "Active la fonction Absence"
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Quitter"
 
@@ -1640,7 +1644,7 @@ msgstr "Copier dans la conversation"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1721,11 +1725,11 @@ msgstr "Retirer de la liste de ramassage"
 msgid "Add to pickup list"
 msgstr "Ajouter à la liste de ramassage"
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
-msgstr ""
+msgstr "Quêtes"
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr "inconnu"
 
@@ -1781,46 +1785,42 @@ msgstr "Choisissez votre serveur  *** Mode Sûr ***"
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Charger"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Connexion..."
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Éditer"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveurs !"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -1907,7 +1907,7 @@ msgstr "Sélectionner OK"
 
 #: src/gui/setupactiondata.h:163
 msgid "Return to safe video mode"
-msgstr ""
+msgstr "Revenir au mode vidéo sécurisé"
 
 #: src/gui/setupactiondata.h:177
 msgid "Shortcuts modifiers keys"
@@ -2021,7 +2021,7 @@ msgstr "Connaissiez-vous la fenêtre ?"
 
 #: src/gui/setupactiondata.h:406
 msgid "Quests Window"
-msgstr ""
+msgstr "Fenêtre de Quêtes"
 
 #: src/gui/setupactiondata.h:411
 msgid "Previous Social Tab"
@@ -2363,7 +2363,7 @@ msgstr "Basique"
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr "Fenêtres"
 
@@ -2591,46 +2591,46 @@ msgstr "Montrer les messages MVP"
 msgid "This is what the color looks like"
 msgstr "Voilà à quoi ressemble cette couleur"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Type : "
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statique"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Impulsion"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spectre"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Délai : "
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Rouge : "
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Vert : "
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Bleu : "
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Opacité : "
 
@@ -2646,27 +2646,27 @@ msgstr "Rétablir les fenêtres"
 msgid "Input"
 msgstr "Entrée"
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Assigner"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Désassigner"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr "Réinitialiser toutes les touches"
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté(s)"
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2848,107 +2848,111 @@ msgid "Enable shop mode"
 msgstr "Activer le mode boutique"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Enregistrer les conversations des PNJ"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "Support des bots"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "Activer le bot d'enchères"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Activer le support du bot de guilde et désactiver le support par défault"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr "Délai de répétition"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr "Intervalle de répétition"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr "Toujours montrer"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr "Cacher en basse résolution"
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr "Toujours cacher automatiquement"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr "Boutons de raccourcis"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr "Serveur proxy"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr "Système proxy"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr "Connection directe"
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr "Nom d'hôte SOCKS5"
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr "Type de proxy"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr "Adresse du proxy:port"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Active la protection pour serveurs defaillant (ne pas désactiver)"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Activer l'enregistrement des informations de débogage"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "Cacher le bouclier"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utiliser FBO pour les captures d'écran (seulement pour OpenGL)"
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr "Retard du réseau entre les sous-serveurs"
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Montrer le fond"
 
@@ -3200,7 +3204,7 @@ msgstr "Indonésien"
 
 #: src/gui/setup_theme.cpp:134
 msgid "Italian"
-msgstr ""
+msgstr "Italien"
 
 #: src/gui/setup_theme.cpp:135
 msgid "Polish"
@@ -3278,103 +3282,103 @@ msgstr "Taille de police des PNJ"
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Logiciel"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "Open GL rapide."
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "OpenGL sécurisé"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr "Activer le redimensionnement"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr "Pas d'image"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alternative"
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr "Détecter le meilleur mode"
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Aucun"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 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:377
+#: src/gui/setup_video.cpp:370
 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:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 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:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 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:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution personnalisée (Exemple : 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Entrer la nouvelle résolution : "
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 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 "
@@ -3500,31 +3504,31 @@ msgstr "Centrer la fenêtre de jeu"
 msgid "Personal Shop"
 msgstr "Boutique personnelle"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Acheter des objets"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Vendre des objets"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Annoncer"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Montrer les liens dans l'annonce"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "Enchère"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s souhaite %s %s Acceptez-vous ?"
@@ -3575,223 +3579,223 @@ msgstr "Niveau : %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Niveau : %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guilde"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Le joueur %s a été invité dans la guilde %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Demande pour quitter la guilde %s effectuée."
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "Inviter le membre dans la guilde"
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Qui voudriez-vous inviter dans la guilde %s ?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Quitter la guilde ?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Groupe"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter l'utilisateur %s dans le groupe."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Vous avez demandé à quitter le groupe %s."
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "Inviter un joueur dans le groupe"
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Qui voudriez vous inviter dans le groupe %s ?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "Quitter le groupe ?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Atq"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "Monstres prioritaires"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "Attaquer les monstres"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Ignorer les monstres"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr "Pik"
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr "Ramasser les objets"
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr "Ignorer les objets"
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Créer un groupe"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr "F"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Choisissez le nom de la guilde."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
 "dans une."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vous a invité à rejoindre la guilde %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
 "dans un groupe."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Vous avez été invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Nom du groupe"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Choisissez le nom du groupe."
 
@@ -3944,24 +3948,24 @@ msgstr "Accepté. En attente..."
 msgid "Trade: You"
 msgstr "Échange : Vous"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Vous recevez %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Vous donnez :"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Changer"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Vous n'avez pas assez d'argent."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
@@ -4154,7 +4158,7 @@ msgstr "Limites de votre position"
 msgid "Road Point"
 msgstr "Étape"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -4166,11 +4170,11 @@ msgstr "Mise à jour"
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -4363,7 +4367,7 @@ msgstr "Qui est en ligne"
 
 #: src/gui/windowmenu.cpp:74
 msgid "QE"
-msgstr ""
+msgstr "QE"
 
 #: src/gui/windowmenu.cpp:76
 msgid "BC"
@@ -5794,15 +5798,15 @@ msgstr "Portée de l'attaque"
 msgid "Damage per sec."
 msgstr "Dommage par s."
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "Impossible de connecter au serveur \""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "Connexion au serveur terminée."
 
diff --git a/po/he.po b/po/he.po
index 35a8ba9ca..4f8f84e31 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "מתעלם מהצעות סחר נכנסות"
 msgid "Accepting incoming trade requests"
 msgstr "מאשר הצעות סחר נכנסות"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "הגדרות"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "וידאו"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "שגיאה ביצירת ספריית העדכונים!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr "כללי"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "אפס"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "קנה"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "מחיר: %s / סה\"כ: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr "חנות"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "מכר"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr "מכר"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "צור"
 
@@ -597,7 +597,7 @@ msgstr "נקבה"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "מחק"
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "סגור"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "השתמש"
 
@@ -1352,12 +1356,12 @@ msgstr "שלח"
 msgid "Failed to send as sender or letter invalid."
 msgstr "נכשלה השליחה מכיוון והשולח או המכתב בעלי שגיאה."
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "הוסף"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "כך הצבע נראה"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "סטטי"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "פעימה"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "קשת בענן"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "מינסרה"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr "אתחל חלונות"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "שנה"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "נמצאו קונפליקטי מקשים."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "טען מחדש כדי שהשינוי יחול."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "מסך מלא"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "סמן-עכבר מותאם"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "בקשה למסחר"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "גילדה"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "חבורה"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "צור גילדה"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "התקבלה הזמנה לחבורה, אך הזמנה זהה כבר קיימת."
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s הזמין אותך לחבורה שלהם."
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s הזמין אותך להצטרף לחבורת %s."
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "אשר את הזמנת חבורה"
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr "מוסכם. ממתין..."
 msgid "Trade: You"
 msgstr "סחור: אתה"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "אתה נותן:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "שנה"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "אין לך מספיק כסף."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "הוספת הפריט נכשלה. לא ניתן להכניס מעל חפץ אחד לחלון."
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index af46a010f..7e88de929 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Slika"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,12 +257,12 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -270,7 +270,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -278,7 +278,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -286,7 +286,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -294,7 +294,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -302,27 +302,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -339,19 +339,19 @@ msgstr "Općenito"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Mreža Greška"
 
@@ -406,50 +406,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Poništi"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Kupi"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cijena: %s / Ukupno: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -462,13 +462,13 @@ msgstr "Trgovina"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Prodaj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -481,7 +481,7 @@ msgstr "Prodaj"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -587,7 +587,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Stvori"
 
@@ -602,7 +602,7 @@ msgstr "Žensko"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -661,9 +661,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Obriši"
@@ -742,7 +742,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -936,26 +936,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -981,7 +981,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1034,8 +1038,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Opremi"
 
@@ -1359,12 +1363,12 @@ msgstr "Pošalji"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1374,7 +1378,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1518,7 +1522,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1633,7 +1637,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1714,11 +1718,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1774,46 +1778,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2356,7 +2356,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2584,46 +2584,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Ovako izgleda boja"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statično"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulsiranje"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Duga"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spektar"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2639,27 +2639,27 @@ msgstr "Ponovno pokreni prozore"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Dodijeli"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Zadano"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2839,106 +2839,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3266,97 +3270,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Vlastiti kursor"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3480,31 +3484,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3555,219 +3559,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Ceh"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Partija"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Formiraj Ceh"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3920,24 +3924,24 @@ msgstr "Dogovoreno. Čekanje..."
 msgid "Trade: You"
 msgstr "Trgovanje: Vi"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Daješ:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Izmijeni"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4129,7 +4133,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4141,11 +4145,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5725,15 +5729,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 01ff83b8b..303cedd1c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Kereskedési kérelmek elutasítása"
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Videó"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr "Általános"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Alaphelyzet"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Vétel"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Ár: %s / Teljes: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr "Üzlet"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Eladás"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr "Eladás"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Létrehozás"
 
@@ -597,7 +597,7 @@ msgstr "Nő"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Törlés"
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Bezár"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Használ"
 
@@ -1352,12 +1356,12 @@ msgstr "Küldés"
 msgid "Failed to send as sender or letter invalid."
 msgstr "A levél elküldése sikertelen. A feladó, vagy a címzett nem található."
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Hozzáad"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Így fog kinézni a felirat."
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statikus"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulzáló"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Szivárvány"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Színkép"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr "Ablakok alaphelyzetbe"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Hozzárendel"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Teljes képernyő"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Egyéni kurzor"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Üzleti ajánlat"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Klán"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Csapat"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Klán létrehozása"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr "Elfogadva. Vár..."
 msgid "Trade: You"
 msgstr "Üzlet: Te"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Adott tárgyak:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Változtatás"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Nincs elég pénzed."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 6a94aa990..a4a84085b 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-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
 "language/id/)\n"
@@ -29,7 +29,7 @@ msgstr "Abaikan permohonan transaksi"
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
@@ -37,117 +37,117 @@ msgstr "Terlihat di peta"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, 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:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -262,62 +262,62 @@ msgstr "Pemain telah berhasil dihapus"
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "Ukuran jenis huruf cache"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Ukuran Cache:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Buat"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Hapus"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr "Sumber gambar"
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -335,19 +335,19 @@ msgstr "Umum"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
@@ -402,50 +402,50 @@ msgstr "Jalan"
 msgid "Result"
 msgstr "Hasil"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Harga: %s/ Total: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -458,13 +458,13 @@ msgstr "Toko"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Jual"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -477,7 +477,7 @@ msgstr "Jual"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -583,7 +583,7 @@ msgid "Race:"
 msgstr "Ras:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Buat"
 
@@ -598,7 +598,7 @@ msgstr "Perempuan"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Lainnya"
 
@@ -657,9 +657,9 @@ msgstr "Masukan Sandi untuk menghapus karakter"
 msgid "Enter password:"
 msgstr "Masukkan sandi"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Hapus"
@@ -738,7 +738,7 @@ msgstr "pelangi 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -932,26 +932,26 @@ msgstr "Keluar: %d bytes/det"
 msgid "Did You Know?"
 msgstr "Apakah kamu tahu?"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Tutup"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "Sebelumnya"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Selanjutnya"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Buka jendela otomatis"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -977,7 +977,11 @@ msgstr "Tipe server:"
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Menyambung"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1030,8 +1034,8 @@ msgid "Filter:"
 msgstr "Penyaring:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Pakai"
 
@@ -1351,12 +1355,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Setelan: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1366,7 +1370,7 @@ msgstr "Kunci: %s"
 msgid "Unequip first"
 msgstr "Copot lebih dahulu"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Setelan saat bepergian"
 
@@ -1510,7 +1514,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1625,7 +1629,7 @@ msgstr "Pindahkan ke chat"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(kembalikan)"
 
@@ -1706,11 +1710,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1766,46 +1770,42 @@ msgstr "Pilih Servermu *** SAFE MODE ***"
 msgid "Use same ip for game sub servers"
 msgstr "Gunakan ip yang sama untuk sub server game"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Memuat"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Menyambung"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Tambah"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Ganti"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
@@ -2348,7 +2348,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2576,46 +2576,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Warnanya terlihat seperti ini"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Tipe"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statis"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Getar"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Pelangi"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Tunda:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Merah:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Hijau:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Biru:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -2631,27 +2631,27 @@ msgstr "Atur ulang jendela"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Tetapkan"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Batal menetapkan"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Kembalikan"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Pertentangan kunci(kunci) terdeteksi."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2831,106 +2831,110 @@ msgid "Enable shop mode"
 msgstr "Perbolehkan mode Jual"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Riwayat dialog NPC"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
@@ -3258,97 +3262,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Perangkat lunak"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "OpenGL cepat"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "OpenGL aman"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Modifikasi kursor"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "Batas FPS:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS:"
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Tidak ada"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Mengubah ke mode Layar penuh"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Mengubah ke OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Masukkan resolusi baru:"
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Resolusi layar diubah"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3472,31 +3476,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr "Toko personal"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Beli barang"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Jual barang"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Umumkan"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Perlihatkan link di Umumkan"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s ingin %s %s apakah anda bersedia?"
@@ -3547,219 +3551,219 @@ msgstr "Level: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Organisasi"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pengguna yang diajak %s ke organisasi %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Permintaan %s keluar dari Organisasi "
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Tinggalkan organisasi?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Kelompok"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Pengguna yang diajak %s ke kelompok"
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "Mengundang pengguna ke kelompok"
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Sedang meninggalkan keyboard"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "mob prioritas"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "serang mob"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Abaikan mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3912,24 +3916,24 @@ msgstr "Terima. Menunggu..."
 msgid "Trade: You"
 msgstr "Tukar: Anda"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Kamu mendapatkan %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Anda memberikan:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Ubah"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -4120,7 +4124,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4132,11 +4136,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5714,15 +5718,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 5009f5135..f7b5b060f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <guglielmo__@hotmail.it>, 2011, 2012.
@@ -12,14 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
+"language/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actionmanager.cpp:835
@@ -30,7 +31,7 @@ msgstr "Le richieste di scambio in arrivo saranno ignorate"
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
@@ -38,117 +39,117 @@ msgstr "Visibile nella mappa"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Accesso all'account"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Cambia password"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Cambia Email"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, 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:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, 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."
@@ -164,9 +165,11 @@ msgstr "Impossibile inviare un sussurro vuoto!"
 #: src/commandhandler.cpp:363
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
-msgstr "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure sei tu."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
+"sei tu."
 
 #: src/commandhandler.cpp:383
 #, c-format
@@ -261,74 +264,76 @@ msgstr "Giocatore cancellato dal tuo schermo con successo!"
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "Dimensione Cache caratteri"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Dimensione Cache:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Creati:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Eliminati:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
 #: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" (falso), \"1\", \"0\"."
+msgstr ""
+"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
+"\" (falso), \"1\", \"0\"."
 
 #: src/game.cpp:258 src/gui/widgets/chattab.cpp:449
 msgid "General"
@@ -338,19 +343,19 @@ msgstr "Generale"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Screenshot salvato come"
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Errore di rete"
 
@@ -405,50 +410,50 @@ msgstr "Movimento"
 msgid "Result"
 msgstr "Risultato"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Reimposta"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Compra"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prezzo: %s / Totale: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Esci"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -461,13 +466,13 @@ msgstr "Negozio"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Vendi"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -480,7 +485,7 @@ msgstr "Vendi"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -586,7 +591,7 @@ msgid "Race:"
 msgstr "Razza:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Crea"
 
@@ -601,7 +606,7 @@ msgstr "Femmina"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Altro"
 
@@ -660,9 +665,9 @@ msgstr "Digitare password per eliminare un personaggio"
 msgid "Enter password:"
 msgstr "Digitare password:"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Elimina"
@@ -741,7 +746,7 @@ msgstr "Arcobaleno 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -935,26 +940,26 @@ msgstr "Out: %d bytes/s"
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Precedente"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Successivo >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Apri automaticamente questa finestra"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -980,7 +985,11 @@ msgstr "Tipo di server:"
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Connetti"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr "Per favore indicare almeno l'indirizzo e la porta del server."
 
@@ -1033,8 +1042,8 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Equipaggia"
 
@@ -1356,12 +1365,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Outfit: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1371,7 +1380,7 @@ msgstr "Chiave: %s"
 msgid "Unequip first"
 msgstr "Rimuovi prima"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Away outfit"
 
@@ -1515,7 +1524,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Lascia"
 
@@ -1630,7 +1639,7 @@ msgstr "Copia in Chat"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(default)"
 
@@ -1711,11 +1720,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1771,46 +1780,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr "Utilizzare lo stesso IP per i sub server di gioco"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Carica"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Connetti"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Modifica"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloading server list... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Attesa del server..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Preparazione download"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "Richiede una versione più nuova"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "Richiede v%s"
@@ -2353,7 +2358,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr "Finestre"
 
@@ -2581,46 +2586,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Come appaiono i colori"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Type:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statico"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulsazione"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Arcobaleno"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Gamma"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Ritardo: "
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "rosso"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "verde"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "blu"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -2636,32 +2641,34 @@ msgstr "Resetta finestre"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Imposta"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Annullare l'assegnazione"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Predefinito"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Sono stati rilevati conflitti nei tasti."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare inconvenienti"
+msgstr ""
+"Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare "
+"inconvenienti"
 
 #: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
@@ -2836,106 +2843,110 @@ msgid "Enable shop mode"
 msgstr "Abilita la modalità negozio"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Log dialoghi NPC"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr "Tastiera"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr "Server Proxy"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr "Sistema Proxy"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr "Connessione diretta"
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr "Tipologia Proxy"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr "Proxy indirizzo:porta"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "Attiva attacchi server-side"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Abilita il bot checker"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Abilita i log di debug"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "Modalità basso traffico"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "Nascondi lo scudo"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Mostra sfondo"
 
@@ -3263,99 +3274,105 @@ msgstr ""
 msgid "Theme Changed"
 msgstr "Tema cambiato"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "OpenGL veloce"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "OpenGL sicuro"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Limite Alt FPS:  "
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Nessuno"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 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!"
+msgstr ""
+"Cambio verso la modalità finestra fallito e anche il ripristino modalità "
+"precedente è fallito!"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 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!"
+msgstr ""
+"Cambio verso la modalità schermo intero fallito e anche il ripristino della "
+"modalità precedente è fallito!"
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Cambiamento a schermo intero"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Cambiamento a OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Risoluzione scelta (esempio 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Nuova risoluzione:                                         "
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "RIsoluzione schermo cambiata"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione ridotta"
+msgstr ""
+"Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
+"ridotta"
 
 #: src/gui/setup_visual.cpp:35
 msgid "Visual"
@@ -3477,31 +3494,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr "Negozio personale"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Compra oggetti"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Vendi oggetti"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Annuncia"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Mostra link nell'annuncio"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vuole %s %s accetti?"
@@ -3552,219 +3569,219 @@ msgstr "Lvl: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Lvl: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Gilda"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Invitato utente %s alla gilda %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Abbandono gilda %s richiesto."
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "invita qualcuno nel gruppo"
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Chi vorresti invitare alla gilda %s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Lasciare la gilda?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Sei sicuro di voler lasciare la gilda %s?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Invitato utente al gruppo %s"
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Abbandono gruppo %s richiesto"
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "Invita qualcuno nel gruppo"
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Chi vorresti invitare al gruppo %s?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "Lasciare il gruppo?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Sei sicuro di voler lasciare il gruppo %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Attacco"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "Priorità mobs"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "Attacca mobs"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Ignora mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Crea una Gilda"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Crea gruppo"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Sociale"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Invita"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accettato invito al gruppo da parte di %s"
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rifiutato invito al gruppo da parte di %s"
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accettato invito alla gilda da parte di %s"
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rifiutato invito alla gilda da parte di %s"
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Stai creando una gilda chiamata %s"
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Stai creando un party chiamato %s"
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Nome della gilda"
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Scegli un nome per la tua gilda"
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s ti ha invitato ad entrare nella gilda %s"
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Accetta invito alla gilda"
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "Sei stato invitato ad entrare in un party"
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sei stato invitato ad entrare nel gruppo %s"
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossibile creare un party, sei già in un party"
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Nome del gruppo"
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party"
 
@@ -3917,27 +3934,28 @@ msgstr "Accettato. In attesa..."
 msgid "Trade: You"
 msgstr "Commercia: Tu"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Ottieni %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Dai:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Cambia"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Non hai abbastanza denaro."
 
-#: src/gui/tradewindow.cpp:456
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla finestra."
+#: src/gui/tradewindow.cpp:458
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
+"finestra."
 
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
@@ -4126,7 +4144,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Chi è online - Aggiornamento in corso"
 
@@ -4138,11 +4156,11 @@ msgstr "Aggiornamento"
 msgid "Who Is Online - "
 msgstr "Chi è online -   "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Chi è online - errore"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "Chi è online - aggiornamento"
 
@@ -4214,7 +4232,9 @@ msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
-msgstr "Gli operatori possono rendere operatiori o cacciare gli altri utenti dal canale."
+msgstr ""
+"Gli operatori possono rendere operatiori o cacciare gli altri utenti dal "
+"canale."
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
@@ -4307,16 +4327,18 @@ msgstr "Comando: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Questo comando ignora l'altro giocatore, senza tenere conto delle relazioni"
+msgstr ""
+"Questo comando ignora l'altro giocatore, senza tenere conto delle relazioni"
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <giocatore>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr "Questo comando smette di ignorare l'altro giocatore se è stato ignorato in precedenza"
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Questo comando smette di ignorare l'altro giocatore se è stato ignorato in "
+"precedenza"
 
 #: src/gui/windowmenu.cpp:72
 msgid "ONL"
@@ -4841,7 +4863,9 @@ msgstr "  -c --character      : Effettua il Login con questo personaggio"
 
 #: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Effettua il Login con questo nome Server o a questo indirizzo IP"
+msgstr ""
+"  -s --server         : Effettua il Login con questo nome Server o a questo "
+"indirizzo IP"
 
 #: src/main.cpp:71
 msgid "  -p --port           : Login server port"
@@ -4869,7 +4893,8 @@ msgstr ""
 
 #: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
+msgstr ""
+"     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
 
 #: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
@@ -5263,7 +5288,9 @@ msgstr "Rifiutato dal server."
 #: src/net/ea/loginhandler.cpp:241
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Il tuo account è stato bandito permanentemente dal gioco. Contattare il GM per maggiori informazioni."
+msgstr ""
+"Il tuo account è stato bandito permanentemente dal gioco. Contattare il GM "
+"per maggiori informazioni."
 
 #: src/net/ea/loginhandler.cpp:245
 msgid "Client too old."
@@ -5346,7 +5373,8 @@ msgstr "Sei morto."
 
 #: src/net/ea/playerhandler.cpp:99
 msgid "We regret to inform you that your character was killed in battle."
-msgstr "Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia."
+msgstr ""
+"Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia."
 
 #: src/net/ea/playerhandler.cpp:101
 msgid "You are not that alive anymore."
@@ -5368,13 +5396,17 @@ msgstr ""
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
-msgstr "No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato in un posto migliore."
+msgstr ""
+"No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato "
+"in un posto migliore."
 
 #: src/net/ea/playerhandler.cpp:107
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
-msgstr "Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola ha fallito."
+msgstr ""
+"Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola "
+"ha fallito."
 
 #: src/net/ea/playerhandler.cpp:109
 msgid "I guess this did not run too well."
@@ -5399,7 +5431,9 @@ msgstr ""
 #: src/net/ea/playerhandler.cpp:119
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Hai combinato un altro disastro, getta il tuo corpo nelle fogne e prenditene uno nuovo."
+msgstr ""
+"Hai combinato un altro disastro, getta il tuo corpo nelle fogne e prenditene "
+"uno nuovo."
 
 #: src/net/ea/playerhandler.cpp:122
 msgid "You're not dead yet. You're just resting."
@@ -5462,8 +5496,7 @@ msgstr "Messaggio"
 
 #: src/net/ea/playerhandler.cpp:341
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:351
@@ -5721,15 +5754,15 @@ msgstr "Range d'attacco"
 msgid "Damage per sec."
 msgstr "Danno per secondo"
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "Impossibile contattare l'host \""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "Connessione al server terminata. "
 
diff --git a/po/ja.po b/po/ja.po
index f2d6555e4..018190503 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-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -31,7 +31,7 @@ msgstr "トレードリクエストを無効にしています"
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
@@ -39,117 +39,117 @@ msgstr "マップに表示させる"
 msgid "Human"
 msgstr "人間"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "パフォーマンス"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "テーマ"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "ログインしています"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう"
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません"
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:%s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません"
@@ -264,62 +264,62 @@ msgstr "プレイヤーを削除しました"
 msgid "Player could not be erased!"
 msgstr "プレイヤーを削除できませんでした"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d週"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d日"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時"
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "フォントキャッシュサイズ"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "キャッシュサイズ:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "作成:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "削除:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
@@ -337,19 +337,19 @@ msgstr "一般"
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr " としてスクリーンショットを保存しました"
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました"
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
@@ -404,50 +404,50 @@ msgstr "動く"
 msgid "Result"
 msgstr "結果"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "リセット"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "買う"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "価格:%s /合計:%s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr "量:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "終了"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -460,13 +460,13 @@ msgstr "店"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "売る"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -479,7 +479,7 @@ msgstr "売る"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -585,7 +585,7 @@ msgid "Race:"
 msgstr "人種:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "作成"
 
@@ -600,7 +600,7 @@ msgstr "女性"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "その他"
 
@@ -659,9 +659,9 @@ msgstr "キャラクターを削除するにはパスワードを入力して下
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "削除"
@@ -740,7 +740,7 @@ msgstr "カラフル 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -934,26 +934,26 @@ msgstr "出力: %d バイト/秒"
 msgid "Did You Know?"
 msgstr "豆知識"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "閉じる"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< 前へ"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "次へ >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "この窓を自動で開ける"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -979,7 +979,11 @@ msgstr "サーバータイプ:"
 msgid "Description:"
 msgstr "詳細:"
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "接続"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr "サーバーアドレスとポートを入力して下さい"
 
@@ -1032,8 +1036,8 @@ msgid "Filter:"
 msgstr "フィルタ:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "装着"
 
@@ -1353,12 +1357,12 @@ msgstr "送信する"
 msgid "Failed to send as sender or letter invalid."
 msgstr "文字か差出人が無効の為送信に失敗しました"
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "服装: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1368,7 +1372,7 @@ msgstr "鍵: %s"
 msgid "Unequip first"
 msgstr "最初に取外す"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "AFK中の服装"
 
@@ -1512,7 +1516,7 @@ msgstr "AFKを有効にする"
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "退会"
 
@@ -1627,7 +1631,7 @@ msgstr "チャットへコピーする"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1708,11 +1712,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1768,46 +1772,42 @@ msgstr "サーバーを選んで下さい  *** セーフモード ***"
 msgid "Use same ip for game sub servers"
 msgstr "同じIPをゲームサブサーバーでも使用する"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "読込み"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "接続"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "追加"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "編集"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "サーバーからの応答を待っています"
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "ダウンロード準備中..."
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "サーバーリストの読み込みに失敗"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "アップデートが必要です"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "v%sが必要"
@@ -2350,7 +2350,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr "ウィンドウ"
 
@@ -2578,46 +2578,46 @@ msgstr "MVPメッセージを表示する"
 msgid "This is what the color looks like"
 msgstr "色の例"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "タイプ:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "穏やか"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "点滅"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "カラフル"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "スペクトル"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "遅延:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "赤:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "緑:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "青:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "アルファ:"
 
@@ -2633,27 +2633,27 @@ msgstr "ウィンドウをリセットする"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "割り当てる"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "割り当て解除"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "標準に戻す"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "ショートカットキーが重複しています"
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2835,106 +2835,110 @@ msgid "Enable shop mode"
 msgstr "ショップモードを有効にする"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "NPCダイアログを記録する"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "ボットサポート"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "オークションボットのサポート"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr "ギルドサポートを無効にしギルドボットを有効にする"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "サーバーサイドアタックを有効にする"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "ボットチェッカーを有効にする"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "不安定なサーバー保護を有効にする(無効にしない)"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "デバッグログを有効にする"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "低トラフィックモード"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "シールドスプライトを隠す"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "スクリーンショットにFBOを使う (OpenGLのみ)"
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "背景を表示する"
 
@@ -3265,97 +3269,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr "テーマを変更しました"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更の為アプリケーションを再起動してください"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "マップポータルを強調表示"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "速い OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "セーフ OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "フルスクリーン"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr "リサイズを有効にする"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr "フレームなし"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "FPSリミット:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Alt FPS リミット: "
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "なし"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "ウインドウモード、また前モードの復元にも失敗しました"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "フルスクリーンモード、また前モードの復元にも失敗しました"
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "フルスクリーンに変更"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更の為、再起動をしてください"
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "OpenGLに変更"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGLの設定を変更するため、再起動をしてください"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "カスタム解像度 (例: 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "解像度を入力して下さい:                "
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "スクリーンの解像度を変更しました"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります"
 
@@ -3479,31 +3483,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr "最大 (15)"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "購入"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "販売"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "アナウンス"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "アナウンスにリンクを表示する"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "オークション"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか？"
@@ -3554,219 +3558,219 @@ msgstr "Lvl: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Lvl: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "ギルド"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "ユーザー %sを、ギルド %sに招待しました"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "ギルド %sへ退会届を出しました"
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "ギルドへメンバーを招待しました"
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "ギルド %sに誰を招待しますか？"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "ギルドから退会しますか？"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "ギルド %sから本当に退会しますか?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "パーティー"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "ユーザー %s をパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr "パーティ %sへ退会届を出しました"
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "メンバーをパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "パーティ %sに誰を招待しますか?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "パーティーから退会しますか？"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "パーティ %sから本当に退会しますか?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "ナビ"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "攻撃"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "優先される敵"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "敵を攻撃する"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "無視している敵"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "ギルドを作成する"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "パーティを作る"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "ソーシャル"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "招待"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr "友達"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからのパーティ招待を承認しました"
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました"
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました"
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました"
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド %sを作成しました"
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "パーティ %sを作成しました"
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "ギルド名"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "ギルド名を選んでください"
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "ギルド招待を承認したが既に入会しています"
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sがギルド %sへ招待しています"
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "ギルド招待を受け入れる"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "パーティ招待を承認したが既に入会しています"
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "パーティに招待されました"
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "パーティ %sに招待されました"
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "パーティ名"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください"
 
@@ -3919,24 +3923,24 @@ msgstr "了承しました"
 msgid "Trade: You"
 msgstr "トレード:自分"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "%sを手に入れた"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "トレードするアイテム:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "変更"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "GP不足です"
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
@@ -4129,7 +4133,7 @@ msgstr "ホームボーダー"
 msgid "Road Point"
 msgstr "ロードポイント"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "オンラインリスト - アップデート中"
 
@@ -4141,11 +4145,11 @@ msgstr "アップデート"
 msgid "Who Is Online - "
 msgstr "オンラインリスト - "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "オンラインリスト - エラー"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
@@ -5737,15 +5741,15 @@ msgstr "攻撃距離"
 msgid "Damage per sec."
 msgstr "ダメージ/秒"
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "ネットワークに空のアドレスが送信されました::connect()!"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "ホスト名を解決できません"
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "サーバーへの接続が切断されました "
 
diff --git a/po/ka.po b/po/ka.po
index 452b1f7f4..fcfa01c68 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,62 +257,62 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -329,19 +329,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -396,50 +396,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -452,13 +452,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -471,7 +471,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -577,7 +577,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr ""
 
@@ -592,7 +592,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -651,9 +651,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -926,26 +926,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -971,7 +971,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1024,8 +1028,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1345,12 +1349,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1360,7 +1364,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1504,7 +1508,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1619,7 +1623,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1700,11 +1704,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1760,46 +1764,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2570,46 +2570,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2625,27 +2625,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2825,106 +2825,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3252,97 +3256,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3466,31 +3470,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3541,219 +3545,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3906,24 +3910,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4115,7 +4119,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4127,11 +4131,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5709,15 +5713,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 71be26a27..35dc222ad 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-08-04 18:32+0300\n"
+"POT-Creation-Date: 2012-08-15 02:22+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"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr ""
 
@@ -597,7 +597,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr ""
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1352,12 +1356,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -4121,7 +4125,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4133,11 +4137,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5714,15 +5718,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 0ad31b3bb..d5bcfe08f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Feil"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr "Generelt"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Tilbakestill"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Kjøp"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr "Butikk"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Selg"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr "Selg"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Lag"
 
@@ -597,7 +597,7 @@ msgstr "Kvinne"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Slett"
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Lukk"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1352,12 +1356,12 @@ msgstr "Send"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Slik ser fargen ut"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statisk"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Regnbue"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Tildel"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Standard"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Fullskjerm"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Endringer av OpenGL krever restart."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 0644d898f..bcb8f8f19 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/manaplus/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Inkomende handelsaanvragen negeren"
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr "Algemeen"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr "Winkel"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Verkopen"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -597,7 +597,7 @@ msgstr "Vrouwelijk"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Verwijderen"
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Uitrusten"
 
@@ -1352,12 +1356,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Regenboog"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr "Vensters in beginstand"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Toewijzen"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Standaard"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 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:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr "Goedgekeurd. Wachten..."
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Veranderen"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 2730b9c6d..8bae413c6 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-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:26+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -28,7 +28,7 @@ msgstr "Inkomende handelsaanvragen negeren"
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -36,117 +36,117 @@ msgstr "Zichtbaar op de map"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, 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:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, 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."
@@ -261,67 +261,67 @@ msgstr "Speler succesvol verwijderd!"
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weken"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uren"
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d seconden"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Aangemaakt:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Verwijdered:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -339,19 +339,19 @@ msgstr "Algemeen"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -406,50 +406,50 @@ msgstr "Beweeg"
 msgid "Result"
 msgstr "Resultaat"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -462,13 +462,13 @@ msgstr "Winkel"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Verkopen"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -481,7 +481,7 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -587,7 +587,7 @@ msgid "Race:"
 msgstr "Ras:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -602,7 +602,7 @@ msgstr "Vrouwelijk"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Andere"
 
@@ -661,9 +661,9 @@ msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Verwijderen"
@@ -742,7 +742,7 @@ msgstr "regenboog 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -936,26 +936,26 @@ msgstr "Uitvoer: %d bytes/sec"
 msgid "Did You Know?"
 msgstr "Weet u?"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Vorig"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Volgend >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -981,7 +981,11 @@ msgstr "Server type:"
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Verbinden"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1034,8 +1038,8 @@ msgid "Filter:"
 msgstr "Filter:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Uitrusten"
 
@@ -1357,12 +1361,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Kleren: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1372,7 +1376,7 @@ msgstr "Sleutel: %s"
 msgid "Unequip first"
 msgstr "Verwijder uitrusting eerst"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
@@ -1516,7 +1520,7 @@ msgstr "away aanzetten"
 msgid "Disable away"
 msgstr "away afzetten"
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -1631,7 +1635,7 @@ msgstr "Kopieer naar chat"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1712,11 +1716,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1772,46 +1776,42 @@ msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 msgid "Use same ip for game sub servers"
 msgstr "Gebruik hetzelfde ip voor spel sub-servers"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Laden"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Verbinden"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Wijzig"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -2354,7 +2354,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2582,46 +2582,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Type:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Regenboog"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Vertraging:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Rood:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Groen:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Blauw:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -2637,27 +2637,27 @@ msgstr "Vensters in beginstand"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Toewijzen"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Standaard"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2837,106 +2837,110 @@ msgid "Enable shop mode"
 msgstr "shop modus aanzetten"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "Aanval gecontroleerd door server aanzetten"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Bot controle aanzetten"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Toon achtergrond"
 
@@ -3264,101 +3268,101 @@ msgstr ""
 msgid "Theme Changed"
 msgstr "Thema is gewijzigd"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "Snelle OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "Veilige OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "FPS limiet:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Alt FPS limiet: "
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Geen"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 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:377
+#: src/gui/setup_video.cpp:370
 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:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 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:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:                "
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
@@ -3484,31 +3488,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Koop voorwerpen"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Verkoop voorwerpen"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Aankondigingen"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Toon links in aankondigingen"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
@@ -3559,219 +3563,219 @@ msgstr "Niv: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Niv: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "gebruiker %s uitgenodigd in guild %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild %s verlating aangevraagd."
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wie zou u willen uitnodigen in guild %s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Verlaten Guild?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gebruiker %s uitgenodigd in groep."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wie zou u willen uitnodigen in group %s?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "Verlaten Groep?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bent u zeker dat u groep %s wilt verlaten?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Aanv"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Groep aanmaken"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Sociaal"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Nodig uit"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Guild Naam"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam"
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Groep Naam"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -3924,24 +3928,24 @@ msgstr "Goedgekeurd. Wachten..."
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "U krijgt %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Veranderen"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
@@ -4134,7 +4138,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
@@ -4146,11 +4150,11 @@ msgstr "Bijwerken"
 msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -5757,15 +5761,15 @@ msgstr "Aanvalsbereik"
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Leeg adres gegeven aan Network::connect()!"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "Niet mogelijk te resolven van host \""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "Verbinding met server beëindigd. "
 
diff --git a/po/pl.po b/po/pl.po
index c3bcf03ad..a1b043cdc 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-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
 "pl/)\n"
@@ -29,7 +29,7 @@ msgstr "Ignorowanie przychodzących próśb o handel"
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
@@ -37,117 +37,117 @@ msgstr "Widoczne na mapie"
 msgid "Human"
 msgstr "Człowiek"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "Unik!"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Wydajność programu"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Ekran"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "Skórki"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Logowanie"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, 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:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy serwer aktualizacji: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, 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."
@@ -261,12 +261,12 @@ msgstr "Gracz usunięty z powodzeniem!"
 msgid "Player could not be erased!"
 msgstr "Gracz nie mógł zostać usunięty!"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -274,7 +274,7 @@ msgstr[0] "%d tydzień"
 msgstr[1] "%d tygodni/e"
 msgstr[2] "%d tygodni/e"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -282,7 +282,7 @@ msgstr[0] "%d dzień"
 msgstr[1] "%d dni"
 msgstr[2] "%d dni"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -290,7 +290,7 @@ msgstr[0] "%d godzina"
 msgstr[1] "%d godzin/y"
 msgstr[2] "%d godzin/y"
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -298,7 +298,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minut/y"
 msgstr[2] "%d minut/y"
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -306,27 +306,27 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekund/y"
 msgstr[2] "%d sekund/y"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "rozmiar cache czcionki"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Rozmiar cache:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Stworzono:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Usunięto:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
@@ -343,19 +343,19 @@ msgstr "Ogólny"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Zrzut ekranu zapisany jako"
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Błąd sieci"
 
@@ -410,50 +410,50 @@ msgstr "Podejdź"
 msgid "Result"
 msgstr "Rezultat"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Resetuj"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Kup"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s/ Razem: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr "Ilość:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -466,13 +466,13 @@ msgstr "Sklep"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Sprzedaj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -485,7 +485,7 @@ msgstr "Sprzedaj"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -591,7 +591,7 @@ msgid "Race:"
 msgstr "Rasa:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Utwórz"
 
@@ -606,7 +606,7 @@ msgstr "Kobieta"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Inne"
 
@@ -665,9 +665,9 @@ msgstr "Wprowadź hasło aby usunąć postać"
 msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Usuń"
@@ -746,7 +746,7 @@ msgstr "tęczowy 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -940,26 +940,26 @@ msgstr "Wyjście: %d bajtów"
 msgid "Did You Know?"
 msgstr "Cz wiesz że..."
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Cofnij"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Dalej>"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Otwieraj to okno automatycznie"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -985,7 +985,11 @@ msgstr "Typ serwera:"
 msgid "Description:"
 msgstr "Opis:"
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Połącz"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr "Wymagany zarówno adres jak i port serwera."
 
@@ -1038,8 +1042,8 @@ msgid "Filter:"
 msgstr "Filtr:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Załóż"
 
@@ -1363,12 +1367,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Strój: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1378,7 +1382,7 @@ msgstr "Klawisz: %s"
 msgid "Unequip first"
 msgstr "Najpierw zdejmij"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Strój na afk"
 
@@ -1522,7 +1526,7 @@ msgstr "Włącz tryb AFK"
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Opuść"
 
@@ -1637,7 +1641,7 @@ msgstr "Skopiuj do czatu"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1718,11 +1722,11 @@ msgstr "Usuń z listy podnoszonych"
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr "nieznane"
 
@@ -1778,46 +1782,42 @@ msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
 msgid "Use same ip for game sub servers"
 msgstr "Użyj tego samego IP dla podserwerów"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Załaduj"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Połącz"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Edycja"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Ściąganie listy serwerów... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Czekanie na serwer..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Przygotowanie ściągania"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "wymaga nowszej wersji"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "wymaga v%s"
@@ -2360,7 +2360,7 @@ msgstr "Podstawowe"
 msgid "Shortcuts"
 msgstr "Skróty"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr "Okna"
 
@@ -2588,46 +2588,46 @@ msgstr "Pokazuj wiadomości MVP"
 msgid "This is what the color looks like"
 msgstr "Kolor będzie wyglądał w ten sposób"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statyczny"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulsujący"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Tęcza"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Widmo"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Opóźnienie:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Czerwony:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Zielony:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Niebieski:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -2643,27 +2643,27 @@ msgstr "Zresetuj okna"
 msgid "Input"
 msgstr "Wejście"
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Przypisz"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Odznacz"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr "Zresetuj wszystkie klawisze"
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Domyślne"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2845,106 +2845,110 @@ msgid "Enable shop mode"
 msgstr "Włącz tryb sklepu"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Loguj dialogi NPC"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "Integracja z botami"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "Włącz integrację z AuctionBotem"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Włącz integrację z guild-botem i wyłącz natywną obsługę gildii"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr "Klawiatura"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr "Opóźnienie powtarzania"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr "Interwał powtarzania"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr "Zawsze pokazuj"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr "Autoukrywanie w małej rozdzielczości"
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr "Autoukrywanie"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr "Guziki skrótów"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr "Serwer proxy"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr "Proxy systemowe"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr "Bezpośrednie połączenie"
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr "Nazwa hosta SOCKS5"
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr "Rodzaj proxy"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr "Adres serwera:port"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "Włącz atak ze strony serwera"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Włącz wykrywacza botów"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Włącz ochronę przeciw zbugowanym serwerom"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Włącz logowanie Debug"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "Tryb niskiego transferu"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "Chowaj obrazek tarczy"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Używaj FBO do screenshotów (tylko w OpenGL)"
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr "Opóźnienie sieci między podserwerami"
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Pokazuj tło"
 
@@ -3272,100 +3276,100 @@ msgstr ""
 msgid "Theme Changed"
 msgstr "Skórka zmieniona"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "Szybki OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "Bezpieczny OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Pełny ekran"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr "Włącz zmianę rozmiaru"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr "Bez ramki"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "Limit FPS:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Alternatywny limit FPS:"
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr "Wykryj najlepszy tryb"
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Brak"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 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:377
+#: src/gui/setup_video.cpp:370
 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:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Zmiana na tryb pełnoekranowy"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Zmiana na OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Własna rozdzielczość (np. 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Wpisz nową rozdzielczość:"
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Rozdzielczość zmieniona"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 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 "
@@ -3491,31 +3495,31 @@ msgstr "Wycentruj okno gry"
 msgid "Personal Shop"
 msgstr "Własny sklep"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Kupuj"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Sprzedaj"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Ogłoś"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Pokazuj linki w ogłoszeniach"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "Aukcja"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Prośba o handel"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s%s, akceptujesz?"
@@ -3566,219 +3570,219 @@ msgstr "Poziom: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Poziom: %d(%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Gildia"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Zaproszono gracza %s do gildii %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Poproszono o wyjście z gildii %s."
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "Zaproszenie do gildii"
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kogo chcesz zaprosić do gildii %s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Opuścić gildię?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Na pewno opuścić gildię %s?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupa"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gracz %s zaproszony do grupy."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Poproszono o wyjście z grupy %s."
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "Zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kogo chcesz zaprosić do grupy %s?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "Opuścić grupę?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Na pewno opuścić grupę %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "GPS"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "Priorytetowe moby"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "Atakuj moby"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Ignoruj moby"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr "Pod"
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr "Podnoś przedmioty"
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr "Ignoruj przedmioty"
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Utwórz gildię"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Utwórz grupę"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Społeczność"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr "V"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr "F"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Tworzenie gildii o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Tworzenie grupy o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Nazwa gildii"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Wybierz nazwę gildii."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił/a Cię do gildii %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "Zostałeś/aś zaproszony/a do grupy."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Zostałeś/aś zaproszony/a do grupy %s."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił/a Cię do grupy."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "Nie można utworzyć grupy. Już należysz do grupy."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
@@ -3931,24 +3935,24 @@ msgstr "Zaakceptowano. Oczekiwanie..."
 msgid "Trade: You"
 msgstr "Handel: Ty"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Otrzymujesz %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Dajesz:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Zmień"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
@@ -4141,7 +4145,7 @@ msgstr "Obwódka lokalizacji domowej"
 msgid "Road Point"
 msgstr "Drogowskaz"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Kto jest online- aktualizacja"
 
@@ -4153,11 +4157,11 @@ msgstr "Aktualizuj"
 msgid "Who Is Online - "
 msgstr "Gracze online- "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Gracze online- błąd"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "Gracze online- aktualizacja"
 
@@ -5759,15 +5763,15 @@ msgstr "Zasięg ataku"
 msgid "Damage per sec."
 msgstr "Obrażenia na sek."
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Network::connect() otrzymał pusty adres!"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "Nie można było odnaleźć serwera."
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "Połączenie z serwerem przerwane."
 
diff --git a/po/pt.po b/po/pt.po
index b167e9249..7a714f8d3 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-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
 "language/pt/)\n"
@@ -29,7 +29,7 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
@@ -37,117 +37,117 @@ msgstr "Visivel no mapa"
 msgid "Human"
 msgstr "Humano"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, 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:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, 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."
@@ -262,67 +262,67 @@ msgstr "Jogador apagado com sucesso!"
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "Tamanho do cache de fonte"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Tamanho de Cache:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
@@ -340,19 +340,19 @@ msgstr "Geral"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -407,50 +407,50 @@ msgstr "Mover"
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Resetar"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr "Quantidade:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -463,13 +463,13 @@ msgstr "Loja"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Vender"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -482,7 +482,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -588,7 +588,7 @@ msgid "Race:"
 msgstr "Corrida:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Criar"
 
@@ -603,7 +603,7 @@ msgstr "Mulher"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Outro"
 
@@ -662,9 +662,9 @@ msgstr "Entre com a Senha para Deletar o usuario"
 msgid "Enter password:"
 msgstr "Entre com a senha"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Excluir"
@@ -743,7 +743,7 @@ msgstr "arco-íris 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -937,26 +937,26 @@ msgstr "Saída: %d bytes/s"
 msgid "Did You Know?"
 msgstr "Você sabia?"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Anterior"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Próximo >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Abrir automaticamente esta janela"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -982,7 +982,11 @@ msgstr "Tipo de servidor:"
 msgid "Description:"
 msgstr "Descrição:"
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Conectar"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor coloque ao menos uma porta de servidor."
 
@@ -1035,8 +1039,8 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Equipar"
 
@@ -1358,12 +1362,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1373,7 +1377,7 @@ msgstr "Tecla: %s"
 msgid "Unequip first"
 msgstr "Desequipar antes"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
@@ -1517,7 +1521,7 @@ msgstr "Habilitar longe do teclado"
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Sair"
 
@@ -1632,7 +1636,7 @@ msgstr "Copiar para o chat"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1713,11 +1717,11 @@ msgstr "Remover lista de pegar itens"
 msgid "Add to pickup list"
 msgstr "Adicionar na lista de pegar itens"
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr "desconhecido"
 
@@ -1773,46 +1777,42 @@ msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Conectar"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Editar"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -2355,7 +2355,7 @@ msgstr "Básico"
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2583,46 +2583,46 @@ msgstr "Ver mensagens MVP"
 msgid "This is what the color looks like"
 msgstr "A cor vai ficar assim"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Estático"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulso"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Arco-íris"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Vermelho:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Verde:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Azul:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -2638,27 +2638,27 @@ msgstr "Restaurar janelas"
 msgid "Input"
 msgstr "Entrada"
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Atribuir"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Retirar"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr "Resetar todas teclas"
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Padrão"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2840,106 +2840,110 @@ msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "Suporte de bots"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "Habilitar suporte ao AuctionBot "
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr "Atraso de repetição"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr "Intervalo de repetição"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr "Sempre mostrar"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr "Auto ocultar em baixa resolução"
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr "Sempre alto ocultar"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr "Botões de atalho"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr "Servidor Proxy"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr "Proxy de sistema"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr "Conexão Direta"
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr "SOCK5 hostname"
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção contra bugs no servidor (não desabilitar)"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr "Atraso de rede entre os sub servidores"
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
@@ -3267,100 +3271,100 @@ msgstr "Tamanho da fonte de NPC"
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "Rápido OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "Seguro OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr "Habilitar redirecionamento de janela"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr "Sem moldura de janela"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "Limite de FPS:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Limite de FPS alternativo:"
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr "Detectar melhor modo"
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 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:377
+#: src/gui/setup_video.cpp:370
 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:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -3485,31 +3489,31 @@ msgstr "Centro de janela do jogo"
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Comprar itens"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Vender itens"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Anúncio"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "Leilão"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
@@ -3560,219 +3564,219 @@ msgstr "Nível: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Atq"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "Mobs Prioritarios"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "Atacar Mobs"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr "Pik"
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr "Pegar itens"
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr "Ignorar itens"
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -3925,24 +3929,24 @@ msgstr "Aceitou. Aguarde..."
 msgid "Trade: You"
 msgstr "Negócio: você"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Você dá:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Mudar"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
@@ -4134,7 +4138,7 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -4146,11 +4150,11 @@ msgstr "Atualizar"
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -5754,15 +5758,15 @@ msgstr "Atraso de alcance"
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Endereço vazio enviado para Network::connect()!"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "Não foi possível determinar o host \""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 946a61416..0d16ee1da 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "manaplus/language/pt_BR/)\n"
@@ -32,7 +32,7 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
@@ -40,117 +40,117 @@ msgstr "Mapa visivel "
 msgid "Human"
 msgstr "Humano"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Fazendo login"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, 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:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, 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."
@@ -265,67 +265,67 @@ msgstr "Jogador apagado com sucesso!"
 msgid "Player could not be erased!"
 msgstr "Jogador não pôde ser apagado!"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "Tamanho de fonte Cache"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Tamanho de cache:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
@@ -343,19 +343,19 @@ msgstr "Geral"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -410,50 +410,50 @@ msgstr "Mover"
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Resetar"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr "Quantidade:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -466,13 +466,13 @@ msgstr "Loja"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Vender"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -485,7 +485,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -591,7 +591,7 @@ msgid "Race:"
 msgstr "Corrida:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Criar"
 
@@ -606,7 +606,7 @@ msgstr "Mulher"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Outro"
 
@@ -665,9 +665,9 @@ msgstr "Entre com a senha para apagar o personagem"
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Excluir"
@@ -746,7 +746,7 @@ msgstr "arco-íris 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -940,26 +940,26 @@ msgstr "Saída: %d bytes/s"
 msgid "Did You Know?"
 msgstr "Você Sabia?"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Anterior"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Próximo >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Auto abrir esta janela"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -985,7 +985,11 @@ msgstr "Tipo de servidor:"
 msgid "Description:"
 msgstr "Descrição:"
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Conectar"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor, pelo menos um dos dois tipos de portas de servidor."
 
@@ -1038,8 +1042,8 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Equipar"
 
@@ -1361,12 +1365,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:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1376,7 +1380,7 @@ msgstr "Tecla: %s"
 msgid "Unequip first"
 msgstr "Desequipar antes"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
@@ -1520,7 +1524,7 @@ msgstr "Habilitar modo indisponível"
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Sair"
 
@@ -1635,7 +1639,7 @@ msgstr "Copiar para chat"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1716,11 +1720,11 @@ msgstr "Remover da lista de pegar"
 msgid "Add to pickup list"
 msgstr "Adicionar a lista de captura"
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr "desconhecido"
 
@@ -1776,46 +1780,42 @@ msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Conectar"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Editar"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -2358,7 +2358,7 @@ msgstr "Básico"
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2586,46 +2586,46 @@ msgstr "Ver Mensagens MVP"
 msgid "This is what the color looks like"
 msgstr "A cor vai ficar assim"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Estático"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulso"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Arco-íris"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Vermelho:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Verde:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Azul:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -2641,27 +2641,27 @@ msgstr "Restaurar janelas"
 msgid "Input"
 msgstr "Entrada"
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Atribuir"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Retirar"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr "Resetar todas teclas"
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Padrão"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2843,106 +2843,110 @@ msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "Suporte de bots"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "Habilitar suporte ao AuctionBot "
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr "Atraso de repetição"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr "Intervalo de repetição"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr "Sempre mostrar"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr "Auto ocultar em baixa resolução"
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr "Sempre ocultar"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr "botões de atalho"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr "Sistema proxy"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr "Conexão direta"
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr "SOCK5 hostname"
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção para servidores com bugs (não desabilitar)"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr "Atraso de rede entre sub servidores"
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
@@ -3272,100 +3276,100 @@ msgstr "Tamanho de fonte de NPC"
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "Rápido OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "Seguro OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr "Habilitar redimensionamento de janela"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr "Sem moldura de janela"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "Limite de FPS:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Limite de FPS alternativo: "
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr "Detectar melhor modo"
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 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:377
+#: src/gui/setup_video.cpp:370
 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:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -3490,31 +3494,31 @@ msgstr "Centro da janela de jogo"
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Comprar itens"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Vender itens"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Anúncio"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "Leilão"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
@@ -3565,219 +3569,219 @@ msgstr "Nível: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Ataque"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "Mobs prioritarios "
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "Atacar mobs"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr "Pik"
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr "Pegar itens"
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr "Ignorar itens"
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -3930,24 +3934,24 @@ msgstr "Aceitou. Aguarde..."
 msgid "Trade: You"
 msgstr "Negócio: você"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Você dá:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Mudar"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
@@ -4139,7 +4143,7 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -4151,11 +4155,11 @@ msgstr "Atualizar"
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -5758,15 +5762,15 @@ msgstr "Atraso de alcance"
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Endereço vazio enviado para Network::connect()!"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "Não foi possível determinar o host \""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
diff --git a/po/ru.po b/po/ru.po
index a915533a7..a103eaaf2 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-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:27+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
@@ -31,7 +31,7 @@ msgstr "Игнорировать предложения о торговле"
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
@@ -39,117 +39,117 @@ msgstr "Видимые на карте"
 msgid "Human"
 msgstr "Человек"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Производительность"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Видео"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "Темы"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -264,12 +264,12 @@ msgstr "Игрок удален!"
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -277,7 +277,7 @@ msgstr[0] "%d неделя"
 msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -285,7 +285,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -293,7 +293,7 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -301,7 +301,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -309,27 +309,27 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "размер кеша шрифта"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr "Размер кеша:"
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "Создано:"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "Удалено:"
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr "Изображений:"
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
@@ -348,19 +348,19 @@ msgstr "Общие"
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Ошибка сети"
 
@@ -415,50 +415,50 @@ msgstr "Движение"
 msgid "Result"
 msgstr "Результат"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Сбросить"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Цена: %s / Всего: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr "Количество:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Выход"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -471,13 +471,13 @@ msgstr "Магазин"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Продать"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -490,7 +490,7 @@ msgstr "Продать"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -596,7 +596,7 @@ msgid "Race:"
 msgstr "Раса:"
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Создать"
 
@@ -611,7 +611,7 @@ msgstr "Женщина"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Другое"
 
@@ -670,9 +670,9 @@ msgstr "Введите пароль для удаления персонажа"
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Удалить"
@@ -751,7 +751,7 @@ msgstr "радуга 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -945,26 +945,26 @@ msgstr "Исх.: %d байт/сек."
 msgid "Did You Know?"
 msgstr "Вы знаете?"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "< Предыдущий"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "Следующий >"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "Автоматически открывать это окно"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -990,7 +990,11 @@ msgstr "Тип:"
 msgid "Description:"
 msgstr "Описание:"
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "Соединиться"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr "Пожалуйста введите хотябы адрес и порт сервера"
 
@@ -1043,8 +1047,8 @@ msgid "Filter:"
 msgstr "Фильтр:"
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Надеть"
 
@@ -1368,12 +1372,12 @@ msgstr "Отправить"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "Наряд: %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1383,7 +1387,7 @@ msgstr "Клавиша: %s"
 msgid "Unequip first"
 msgstr "Сначала снять"
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr "наряд отсутствия"
 
@@ -1527,7 +1531,7 @@ msgstr "Рарешить режим отошел"
 msgid "Disable away"
 msgstr "Запретить режим отошел"
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -1642,7 +1646,7 @@ msgstr "Скопировать в чат"
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1723,11 +1727,11 @@ msgstr "Удалить из поднятия"
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr "Квесты"
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr "неизвестно"
 
@@ -1783,46 +1787,42 @@ msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "Соединиться"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Добавить"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "Изменить"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера"
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -2365,7 +2365,7 @@ msgstr "Основное"
 msgid "Shortcuts"
 msgstr "Горячие клавиши"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr "Окна"
 
@@ -2593,46 +2593,46 @@ msgstr "Показывать MVP сообщения"
 msgid "This is what the color looks like"
 msgstr "Вот, как выглядит сей цвет"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "Введите: "
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Статичный"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Пульсирующий"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Радуга"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Спектр"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "Задержка:"
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "Красный:"
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "Зеленый:"
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "Синий:"
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
@@ -2648,27 +2648,27 @@ msgstr "Сбросить расположение окон"
 msgid "Input"
 msgstr "Ввод"
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Назначить"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "Снять назначение"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr "Сбросить все кнопки"
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2850,106 +2850,110 @@ msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr "Прокручивать прицел по НИП"
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "Сохранять текст NPC"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "Поддержка ботов"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "Включить поддержку бота аукционов"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Включить поддержку гильд-бота"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr "Клавиатура"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr "Задержка перед повтором"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr "Интервал повторения"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr "Всегда показывать"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr "Скрывать с небольшим разрешением"
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr "Всегда скрывать"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr "Кнопки"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr "Прокси сервер"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr "Системный прокси"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr "Прямое соединение"
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 хост"
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr "Тип прокси"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr "Прокси адрес:порт"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Включить защиту от бажных серверов (не выключать!)"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "Режим кеширования игроков"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr "Спрятать картинку счита"
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Использовать FBO для скриншотов (только в режиме opengl)"
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr "Задержка между сетевыми соединениями"
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "Показать фон"
 
@@ -3283,101 +3287,101 @@ msgstr "Размер шрифта НИП (NPC)"
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "Программно"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "Быстрый OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "Безопасный OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Игровой курсор"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr "Разрешить менять размер окна"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr "Без рамки"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "Ограничить кадр/с:"
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr "Найти лучший режим"
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "Нет"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Не удалось переключиться в оконный режим. Восстановить старый режим также не "
 "удалось!"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
 "также не удалось!"
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "Новое разрешение:                   "
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "Разрешение экрана изменено"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
@@ -3503,31 +3507,31 @@ msgstr "Центрировать игровое окно"
 msgid "Personal Shop"
 msgstr "Свой магазин"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "Купить"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "Продать"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "Анонс"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "Показывать ссылки"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "Аукцион"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s хочет %s %s, вы принимаете предложение?"
@@ -3578,219 +3582,219 @@ msgstr "Уровень: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Уровень: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Гильдия"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Пользователь %s приглашен в гильдию %s."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Выход из гильдии %s запрошен."
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "Приглашение игрока в Гильдию"
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Кого вы хотите пригласить в гильдию %s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "Покинуть Гильдию?"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти из гильдии %s?"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Группа"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Пригласить пользователя %s в группу."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Запрошен выход из группы %s."
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr "Пригласить пользователя в группу"
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Кого вы хотите пригласить в группу %s?"
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "Покинуть группу?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите покинуть группу %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr "Нав"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr "Атк"
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr "Приоритетные монстры"
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "Атакуемые монстры"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr "Игнорируемые монстры"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr "Подб"
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr "Подбирать предметы"
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr "Игнорировать предметы"
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Создать Гильдию"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "Создать группу"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr "Общество"
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "Пригласить"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr "И"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr "Д"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "Имя гильдии"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "Выберите имя для гильдии."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не порвое."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает Вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr "Имя группы"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
@@ -3943,24 +3947,24 @@ msgstr "Подтверждено. Ждем-с..."
 msgid "Trade: You"
 msgstr "Торговля: Вы"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "Вы получаете %s."
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Вы отдаете:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Сменить"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "У вас недостаточно денег"
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
@@ -4153,7 +4157,7 @@ msgstr "Бордюр домашней позиции"
 msgid "Road Point"
 msgstr "Точка дороги"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
@@ -4165,11 +4169,11 @@ msgstr "Обновить"
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -5767,15 +5771,15 @@ msgstr "Зона атаки"
 msgid "Damage per sec."
 msgstr "Урон в сек."
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Пустой адрес был передан методу Network::connect()!"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "Не удалось найти хост \""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "Подключение к серверу прервано."
 
diff --git a/po/sk.po b/po/sk.po
index 94238ed00..20192b541 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Nastavenie"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,12 +257,12 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -270,7 +270,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -278,7 +278,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -286,7 +286,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -294,7 +294,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -302,27 +302,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -339,19 +339,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -406,50 +406,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -462,13 +462,13 @@ msgstr "Obchod"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Predaj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -481,7 +481,7 @@ msgstr "Predaj"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -587,7 +587,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Vytvoriť"
 
@@ -602,7 +602,7 @@ msgstr "Žena"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -661,9 +661,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Vymazať"
@@ -742,7 +742,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -936,26 +936,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -981,7 +981,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1034,8 +1038,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Vystrojiť"
 
@@ -1359,12 +1363,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1374,7 +1378,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1518,7 +1522,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1633,7 +1637,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1714,11 +1718,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1774,46 +1778,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2356,7 +2356,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2584,46 +2584,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2639,27 +2639,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2839,106 +2839,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3266,97 +3270,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3480,31 +3484,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3555,219 +3559,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3920,24 +3924,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4129,7 +4133,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4141,11 +4145,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5725,15 +5729,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index 45311e665..260d9102f 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr ""
 
@@ -597,7 +597,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr ""
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1352,12 +1356,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index a56c61db5..7f7ea9370 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Ignorerar handelserbjudanden"
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Fel"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr "Allmänt"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Återställ"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Köp"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr "Affär"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Sälj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr "Sälj"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Skapa"
 
@@ -597,7 +597,7 @@ msgstr "Kvinna"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Ta bort"
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Utrusta"
 
@@ -1352,12 +1356,12 @@ msgstr "Skicka"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kunde inte skicka brevet eftersom antingen avsändaren eller brevet självt är ogiltigt."
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Så här ser färgen ut"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Statisk"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Pulserande"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Regnbåge"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr "Återställ fönster"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Tilldela"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Förval"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "Samma tangent används på flera ställen."
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringen ska börja gälla."
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Helskärm"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "Särskild muspekare"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "Förfrågan om byteshandel"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Gille"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupp"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Skapa gille"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr "Godkänt. Väntar…"
 msgid "Trade: You"
 msgstr "Byteshandel: du"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "Du ger:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Ändra"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags sak flera gånger."
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index deecbde1b..34bf12b23 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:26+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -33,117 +33,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -256,67 +256,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -333,19 +333,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -400,50 +400,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -456,13 +456,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -475,7 +475,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -581,7 +581,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr ""
 
@@ -596,7 +596,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -655,9 +655,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr ""
@@ -736,7 +736,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -930,26 +930,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -975,7 +975,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1028,8 +1032,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1351,12 +1355,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1366,7 +1370,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1510,7 +1514,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1625,7 +1629,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1706,11 +1710,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1766,46 +1770,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2348,7 +2348,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2576,46 +2576,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2631,27 +2631,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2831,106 +2831,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3258,97 +3262,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3472,31 +3476,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3547,219 +3551,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3912,24 +3916,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4121,7 +4125,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4133,11 +4137,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5716,15 +5720,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index f3ca24ad0..6b3ede239 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,67 +257,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -334,19 +334,19 @@ msgstr "సాధారణ"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -401,50 +401,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "వెల: %s / మొత్తం: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "నిష్క్రమించు"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -457,13 +457,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -476,7 +476,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -582,7 +582,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "సృష్టించు"
 
@@ -597,7 +597,7 @@ msgstr "స్త్రీ"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -656,9 +656,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "తొలగించు"
@@ -737,7 +737,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -931,26 +931,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -976,7 +976,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1029,8 +1033,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1352,12 +1356,12 @@ msgstr "పంపించు"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1367,7 +1371,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1626,7 +1630,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1707,11 +1711,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1767,46 +1771,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2577,46 +2577,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "ఇంద్ర ధనస్సు"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2632,27 +2632,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2832,106 +2832,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3259,97 +3263,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "నిండుతెర"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3473,31 +3477,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3548,219 +3552,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3913,24 +3917,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4122,7 +4126,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4134,11 +4138,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5717,15 +5721,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index fbf3c1d10..d6186f8e1 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "ตั้งค่า"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,62 +257,62 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -329,19 +329,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -396,50 +396,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "ออก"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -452,13 +452,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -471,7 +471,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -577,7 +577,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "สร้าง"
 
@@ -592,7 +592,7 @@ msgstr "หญิง"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -651,9 +651,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "ลบทิ้ง"
@@ -732,7 +732,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -926,26 +926,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -971,7 +971,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1024,8 +1028,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1345,12 +1349,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1360,7 +1364,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1504,7 +1508,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1619,7 +1623,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1700,11 +1704,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1760,46 +1764,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2570,46 +2570,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2625,27 +2625,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2825,106 +2825,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3252,97 +3256,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3466,31 +3470,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3541,219 +3545,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3906,24 +3910,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4115,7 +4119,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4127,11 +4131,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5709,15 +5713,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index db35933d1..59b063e53 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Gelen takas istekleri görmezden geliniyor."
 msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "Kur"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "Hata"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,62 +257,62 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -329,19 +329,19 @@ msgstr "Genel"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "Ekrangörüntüsü kaydı başarısız."
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
@@ -396,50 +396,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "Satın al"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Fiyat: %s / Toplam: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -452,13 +452,13 @@ msgstr "Mağaza"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "Satış"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -471,7 +471,7 @@ msgstr "Satış"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -577,7 +577,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "Oluştur"
 
@@ -592,7 +592,7 @@ msgstr "Kadın"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -651,9 +651,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Sil"
@@ -732,7 +732,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -926,26 +926,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "Kapat"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -971,7 +971,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1024,8 +1028,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "Donatmak"
 
@@ -1345,12 +1349,12 @@ msgstr "Gönder"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1360,7 +1364,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1504,7 +1508,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1619,7 +1623,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1700,11 +1704,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1760,46 +1764,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "Ekle"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2570,46 +2570,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "Sabit"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "Darbe"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "Gökkuşağı"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2625,27 +2625,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "Atamak"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "Varsayılan"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2825,106 +2825,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3252,97 +3256,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "Tam ekran"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "Değişikliklerin etkili olması için yeniden başlatılması gerekli."
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL değişikliklerini uygulamak yeniden başlatma gerektirir."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3466,31 +3470,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3541,219 +3545,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Birlik"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Parti"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "Birlik oluşturma"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3906,24 +3910,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "Değiştir"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "Yeterli para yok."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4115,7 +4119,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4127,11 +4131,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5709,15 +5713,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/vls.po b/po/vls.po
index a8acd6ddd..258083cd4 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:26+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -33,117 +33,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -256,67 +256,67 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -333,19 +333,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -400,50 +400,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -456,13 +456,13 @@ msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -475,7 +475,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -581,7 +581,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr ""
 
@@ -596,7 +596,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -655,9 +655,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr ""
@@ -736,7 +736,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -930,26 +930,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -975,7 +975,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1028,8 +1032,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr ""
 
@@ -1351,12 +1355,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1366,7 +1370,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1510,7 +1514,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1625,7 +1629,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1706,11 +1710,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1766,46 +1770,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2348,7 +2348,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2576,46 +2576,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2631,27 +2631,27 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2831,106 +2831,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3258,97 +3262,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3472,31 +3476,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3547,219 +3551,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3912,24 +3916,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -4121,7 +4125,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4133,11 +4137,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5716,15 +5720,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7dbdbe86b..6e64dd92b 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-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -29,7 +29,7 @@ msgstr "忽略新进的交易请求"
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -37,117 +37,117 @@ msgstr "在地图上可见"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "尝试捡起不存在的物品。"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "捡起物品发生不存在的物品。"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "请求注册的详细信息"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "更改密码成功！"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "更改电子邮件"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "更改电子邮件成功！"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在并且无法创建！退出。"
@@ -260,62 +260,62 @@ msgstr "玩家成功删除！"
 msgid "Player could not be erased!"
 msgstr "玩家无法删除！"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "字体缓存大小"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "创建于："
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "删除："
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -332,19 +332,19 @@ msgstr "常规"
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -399,50 +399,50 @@ msgstr "移动"
 msgid "Result"
 msgstr "结果"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "重置"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -455,13 +455,13 @@ msgstr "商店"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "出售"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -474,7 +474,7 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -580,7 +580,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "建立"
 
@@ -595,7 +595,7 @@ msgstr "美女"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "其他"
 
@@ -654,9 +654,9 @@ msgstr "删除字符输入的密码"
 msgid "Enter password:"
 msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "删除"
@@ -735,7 +735,7 @@ msgstr "彩虹3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -929,26 +929,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr "你知道吗？"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "关闭"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "<上一页"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "下一页>"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "自动打开这个窗口"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -974,7 +974,11 @@ msgstr "服务器类型："
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "连接"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1027,8 +1031,8 @@ msgid "Filter:"
 msgstr "过滤器："
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "装备"
 
@@ -1348,12 +1352,12 @@ msgstr "发送"
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "套装： %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1363,7 +1367,7 @@ msgstr "按键：%s"
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1507,7 +1511,7 @@ msgstr "启用远"
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "留下"
 
@@ -1622,7 +1626,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1703,11 +1707,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1763,46 +1767,42 @@ msgstr "选择你的服务器***安全模式***"
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "负载"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "连接"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "编辑"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "准备下载"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误！"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -2345,7 +2345,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2573,46 +2573,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "这就是该色彩看起来的样子"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "类型:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "静止的"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "脉冲"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "色谱"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "延迟："
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "红色："
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "绿色："
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "蓝色："
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "阿尔法："
 
@@ -2628,27 +2628,27 @@ msgstr "重置窗口"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "分配"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "取消分配"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "预设"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突。"
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2828,106 +2828,110 @@ msgid "Enable shop mode"
 msgstr "启用商店模式"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "挂机支持"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "启用拍卖挂机支持"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "显示背景"
 
@@ -3255,97 +3259,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr "主题更改"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "软件"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "快速的OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "安全的OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "w"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:"
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3469,31 +3473,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr "个人商店"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "购买物品"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "出售物品"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "公布"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "显示在公布的联系"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "拍卖"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗？"
@@ -3544,219 +3548,219 @@ msgstr "等级: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "等级: %d（%+d）"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "帮会"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "邀请用户%s加入公会%s"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "退出公会%s的请求。"
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "会员邀请到公会"
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "你要邀请谁加入工会%s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "离开公会？"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你确定要离开工会%s吗？"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "t"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "邀请用户%s加入团队."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "离开团队?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "攻击暴徒"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "建立"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "公会名称"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s"
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党。"
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
@@ -3909,24 +3913,24 @@ msgstr "已同意。等待中……"
 msgid "Trade: You"
 msgstr "交易：你"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "你得到%s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "你给予："
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "改变"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
@@ -4117,7 +4121,7 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -4129,11 +4133,11 @@ msgstr "更新"
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -5717,15 +5721,15 @@ msgstr "攻击范围"
 msgid "Damage per sec."
 msgstr "每秒伤害"
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "空的地址给网络：连接（）！"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "无法解析主机“"
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "连接到服务器终止。"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3990ac4cb..2735927f0 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "顯示"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,62 +257,62 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -329,19 +329,19 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr ""
 
@@ -396,50 +396,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -452,13 +452,13 @@ msgstr "商店"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "出售"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -471,7 +471,7 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -577,7 +577,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "創造"
 
@@ -592,7 +592,7 @@ msgstr "女生"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -651,9 +651,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "刪除"
@@ -732,7 +732,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -926,26 +926,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -971,7 +971,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1024,8 +1028,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "裝備"
 
@@ -1345,12 +1349,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1360,7 +1364,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1504,7 +1508,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1619,7 +1623,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1700,11 +1704,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1760,46 +1764,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "增加"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2570,46 +2570,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2625,27 +2625,27 @@ msgstr "重置視窗"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "分配"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "預設"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突。"
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2825,106 +2825,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3252,97 +3256,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3466,31 +3470,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3541,219 +3545,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3906,24 +3910,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
@@ -4115,7 +4119,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4127,11 +4131,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5709,15 +5713,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5b99f3aed..8f4c88449 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-08-04 15:02+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "忽略收到的交易要求"
 msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr ""
 
@@ -34,117 +34,117 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "顯示"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "建立更新目錄失敗！"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -257,62 +257,62 @@ msgstr ""
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -329,19 +329,19 @@ msgstr "一般"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "網路錯誤"
 
@@ -396,50 +396,50 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "重設"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "價格: %s / 總共: %s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 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:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "減少"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -452,13 +452,13 @@ msgstr "商店"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "出售"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -471,7 +471,7 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -577,7 +577,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "創造"
 
@@ -592,7 +592,7 @@ msgstr "女生"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -651,9 +651,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "刪除"
@@ -732,7 +732,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -926,26 +926,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -971,7 +971,11 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1024,8 +1028,8 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "裝備"
 
@@ -1345,12 +1349,12 @@ msgstr "傳送"
 msgid "Failed to send as sender or letter invalid."
 msgstr "無法傳送的發件人或信息無效。"
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1360,7 +1364,7 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1504,7 +1508,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr ""
 
@@ -1619,7 +1623,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr ""
 
@@ -1700,11 +1704,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1760,46 +1764,42 @@ msgstr ""
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:278
-msgid "Load"
-msgstr ""
-
 #: src/gui/serverdialog.cpp:279
-msgid "Connect"
+msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "增加"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2570,46 +2570,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "這是顏色看起來的樣子"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "狀態"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "暫停"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "光譜"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr ""
 
@@ -2625,27 +2625,27 @@ msgstr "重置視窗"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "分配"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "預設"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突。"
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2825,106 +2825,110 @@ msgid "Enable shop mode"
 msgstr ""
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr ""
 
@@ -3252,97 +3256,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "請重新啟動您的客戶端讓變更生效。"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:544
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3466,31 +3470,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "要求交易"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3541,219 +3545,219 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "公會"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "隊伍"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "建立公會"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1218
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1374
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1391
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1404
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1451
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1474
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1488
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1530
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "收到派對邀請,但而有另一個存在."
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s 邀請你參加他們的派對."
 
-#: src/gui/socialwindow.cpp:1558
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s 邀請你參加 %s 派對."
 
-#: src/gui/socialwindow.cpp:1567
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "接受派對邀請"
 
-#: src/gui/socialwindow.cpp:1582
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1587
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1588
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3906,24 +3910,24 @@ msgstr "已同意。請稍候..."
 msgid "Trade: You"
 msgstr "交易：您"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "你沒有足夠的金錢."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
@@ -4115,7 +4119,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:624
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -4127,11 +4131,11 @@ msgstr ""
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -5709,15 +5713,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr ""