1 files changed, 866 insertions, 804 deletions

diff --git a/po/manaplus.pot b/po/manaplus.pot
index c9030e5c9..1c5cb8f09 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-03-31 19:47+0300\n"
+"POT-Creation-Date: 2012-04-13 02:11+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:1163
+#: src/actorspritemanager.cpp:1162
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:766
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:771
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
+#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:103
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:976 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:981 src/gui/setup_video.cpp:237
+#: src/client.cpp:993 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:986
+#: src/client.cpp:998
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1084
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1110
+#: src/client.cpp:1122
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1144
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1248
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1283
+#: src/client.cpp:1295
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1293
+#: src/client.cpp:1305
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1336 src/client.cpp:1344 src/client.cpp:1479
+#: src/client.cpp:1348 src/client.cpp:1356 src/client.cpp:1491
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:277 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1354
+#: src/client.cpp:1366
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1380
+#: src/client.cpp:1392
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1381
+#: src/client.cpp:1393
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1400
+#: src/client.cpp:1412
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1401
+#: src/client.cpp:1413
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1421
+#: src/client.cpp:1433
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1422
+#: src/client.cpp:1434
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1641 src/client.cpp:1674 src/client.cpp:1689
-#: src/client.cpp:2121 src/client.cpp:2128
+#: src/client.cpp:1653 src/client.cpp:1686 src/client.cpp:1701
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1828
+#: src/client.cpp:1840
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1862 src/client.cpp:1868
+#: src/client.cpp:1874 src/client.cpp:1880
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1889
+#: src/client.cpp:1901
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:505
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:555
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:556
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1087
+#: src/game.cpp:943
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1088
+#: src/game.cpp:944
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -380,87 +380,87 @@ msgstr ""
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:266
+#: src/gui/botcheckerwindow.cpp:267
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
+#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:62
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/setup_input.cpp:74 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboarddata.h:124
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/setup_input.cpp:102
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:270
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
 #: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
 #: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
 #: src/gui/popupmenu.cpp:846
 msgid "Move"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:301
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:132
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
 #: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buydialog.cpp:103
+#: src/gui/buydialog.cpp:102
 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:108 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:121
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:122
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboarddata.h:208
+#: src/gui/setup_input.cpp:158
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
 #: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:175 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
@@ -480,12 +480,12 @@ msgstr ""
 #: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
 #: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
 #: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:888
-#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2028
-#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
-#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
+#: src/gui/popupmenu.cpp:1890 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1978 src/gui/popupmenu.cpp:2024
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2102
+#: src/gui/popupmenu.cpp:2156 src/gui/popupmenu.cpp:2178
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1200 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:169
 msgid "Cancel"
@@ -563,14 +563,14 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
 #: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
-#: src/gui/outfitwindow.cpp:88
+#: src/gui/outfitwindow.cpp:89
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
-#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:88
 msgid "<"
 msgstr ""
 
@@ -591,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Create"
 msgstr ""
 
@@ -605,7 +605,7 @@ msgstr ""
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
 #: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
+#: src/gui/setup_other.cpp:193 src/gui/setup_visual.cpp:89
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
-#: src/gui/setup_visual.cpp:92
+#: src/gui/chatwindow.cpp:119 src/gui/inventorywindow.cpp:71
+#: src/gui/setup_visual.cpp:95
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:120
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:121
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:122
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:123
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:124
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:125
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:126
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:127
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:128
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:129
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:130
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:131
+#: src/gui/chatwindow.cpp:132
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:150 src/gui/inventorywindow.cpp:91
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:160 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:665
+#: src/gui/chatwindow.cpp:669
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1052
+#: src/gui/chatwindow.cpp:1080
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -937,7 +937,7 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
-#: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:204 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
@@ -984,13 +984,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:77
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:544 src/gui/popupmenu.cpp:1855
-#: src/gui/popupmenu.cpp:1951 src/gui/popupmenu.cpp:1998
+#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:161
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1995
 msgid "Unequip"
 msgstr ""
 
@@ -998,85 +998,85 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:71
+#: src/gui/inventorywindow.cpp:72
 msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72
+#: src/gui/inventorywindow.cpp:73
 msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:74
 msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:75
 msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:76
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
+#: src/gui/inventorywindow.cpp:113 src/gui/windowmenu.cpp:79
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:137
+#: src/gui/inventorywindow.cpp:138
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:150
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:546
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1953
-#: src/gui/popupmenu.cpp:2000
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:547
+#: src/gui/popupmenu.cpp:1854 src/gui/popupmenu.cpp:1950
+#: src/gui/popupmenu.cpp:1997
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:550
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1918
-#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:2004
+#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:551
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1954 src/gui/popupmenu.cpp:2001
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1962
-#: src/gui/popupmenu.cpp:2009
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:647
+#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
+#: src/gui/popupmenu.cpp:2006
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1875
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:2015
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:64
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:177
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1974
-#: src/gui/popupmenu.cpp:2021 src/gui/setup.cpp:74
+#: src/gui/inventorywindow.cpp:202 src/gui/inventorywindow.cpp:638
+#: src/gui/popupmenu.cpp:1838 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2018 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:202 src/gui/popupmenu.cpp:1882
+#: src/gui/inventorywindow.cpp:203 src/gui/popupmenu.cpp:1879
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:99
+#: src/gui/inventorywindow.cpp:649 src/gui/popupmenu.cpp:1868
+#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:2011
+#: src/gui/windowmenu.cpp:100
 msgid "Drop"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:72
 msgid "Kill stats"
 msgstr ""
 
@@ -1233,7 +1233,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:122 src/gui/widgets/chattab.cpp:172
 msgid "Server:"
 msgstr ""
 
@@ -1319,7 +1319,7 @@ msgstr ""
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
 msgid "Clear"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:533
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
-#: src/gui/windowmenu.cpp:311
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
+#: src/gui/windowmenu.cpp:312
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:95
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:97
+#: src/gui/outfitwindow.cpp:98
 msgid "Away outfit"
 msgstr ""
 
@@ -1477,7 +1477,7 @@ msgid "Show Items"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2179
+#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2175
 msgid "Undress"
 msgstr ""
 
@@ -1529,8 +1529,8 @@ msgstr ""
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1891
-#: src/gui/popupmenu.cpp:1975 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1888
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:2019
 msgid "Add to chat"
 msgstr ""
 
@@ -1542,8 +1542,8 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2138
-#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2145 src/gui/popupmenu.cpp:2149
 msgid "Remove"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:99
 msgid "Spells"
 msgstr ""
 
@@ -1595,7 +1595,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1263
+#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1264
 msgid "Leave"
 msgstr ""
 
@@ -1618,95 +1618,95 @@ msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1425
+#: src/gui/popupmenu.cpp:1422
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1427
+#: src/gui/popupmenu.cpp:1424
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1826
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1830
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1831
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1832
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1842
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1843
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1847
+#: src/gui/popupmenu.cpp:1844
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1963
-#: src/gui/popupmenu.cpp:2010
+#: src/gui/popupmenu.cpp:1864 src/gui/popupmenu.cpp:1960
+#: src/gui/popupmenu.cpp:2007
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1883
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1887
+#: src/gui/popupmenu.cpp:1884
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1888
+#: src/gui/popupmenu.cpp:1885
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1921 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1976
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2026
-msgid "Load old drop shortcuts"
+#: src/gui/popupmenu.cpp:2022
+msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2091
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2087
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2056 src/gui/popupmenu.cpp:2093
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2099
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2105 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:2101 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2125 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
-#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
+#: src/gui/popupmenu.cpp:2121 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:1019 src/gui/socialwindow.cpp:1054
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2146
+#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2142
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2144
 msgid "Move down"
 msgstr ""
 
@@ -2049,54 +2049,479 @@ msgstr ""
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
-msgid "Press the button to start calibration"
+#: src/gui/setup_input.cpp:54
+msgid "Basic Keys"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
-msgid "Calibrate"
+#: src/gui/setup_input.cpp:58
+msgid "Move Up"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:47
-msgid "Enable joystick"
+#: src/gui/setup_input.cpp:62
+msgid "Move Down"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:50
-msgid "Use joystick if client window inactive"
+#: src/gui/setup_input.cpp:66
+msgid "Move Left"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:53
-msgid "Joystick"
+#: src/gui/setup_input.cpp:70
+msgid "Move Right"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:122
-msgid "Stop"
+#: src/gui/setup_input.cpp:78
+msgid "Target & Attack"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:124
-msgid "Rotate the stick and don't press buttons"
+#: src/gui/setup_input.cpp:82
+msgid "Move to Target"
+msgstr ""
+
+#: src/gui/setup_input.cpp:86
+msgid "Change Move to Target type"
+msgstr ""
+
+#: src/gui/setup_input.cpp:90
+msgid "Move to Home location"
+msgstr ""
+
+#: src/gui/setup_input.cpp:94
+msgid "Set home location"
+msgstr ""
+
+#: src/gui/setup_input.cpp:98
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/gui/setup_input.cpp:106
+msgid "Stop Attack"
+msgstr ""
+
+#: src/gui/setup_input.cpp:110
+msgid "Untarget"
+msgstr ""
+
+#: src/gui/setup_input.cpp:114
+msgid "Target monster"
+msgstr ""
+
+#: src/gui/setup_input.cpp:118
+msgid "Target NPC"
+msgstr ""
+
+#: src/gui/setup_input.cpp:122
+msgid "Target Player"
+msgstr ""
+
+#: src/gui/setup_input.cpp:126
+msgid "Pickup"
+msgstr ""
+
+#: src/gui/setup_input.cpp:130
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/gui/setup_input.cpp:134
+msgid "Hide Windows"
+msgstr ""
+
+#: src/gui/setup_input.cpp:138
+msgid "Sit"
+msgstr ""
+
+#: src/gui/setup_input.cpp:142
+msgid "Screenshot"
+msgstr ""
+
+#: src/gui/setup_input.cpp:146
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: src/gui/setup_input.cpp:150
+msgid "Change Map View Mode"
+msgstr ""
+
+#: src/gui/setup_input.cpp:154
+msgid "Select OK"
+msgstr ""
+
+#: src/gui/setup_input.cpp:162
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/gui/setup_input.cpp:166
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/gui/setup_input.cpp:170 src/gui/setup_input.cpp:174
+#: src/gui/setup_input.cpp:178 src/gui/setup_input.cpp:182
+#: src/gui/setup_input.cpp:186 src/gui/setup_input.cpp:190
+#: src/gui/setup_input.cpp:194 src/gui/setup_input.cpp:198
+#: src/gui/setup_input.cpp:202 src/gui/setup_input.cpp:206
+#: src/gui/setup_input.cpp:210 src/gui/setup_input.cpp:214
+#: src/gui/setup_input.cpp:218 src/gui/setup_input.cpp:222
+#: src/gui/setup_input.cpp:226 src/gui/setup_input.cpp:230
+#: src/gui/setup_input.cpp:234 src/gui/setup_input.cpp:238
+#: src/gui/setup_input.cpp:242 src/gui/setup_input.cpp:246
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/gui/setup_input.cpp:250
+msgid "Windows Keys"
+msgstr ""
+
+#: src/gui/setup_input.cpp:254
+msgid "Help Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:258
+msgid "Status Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:262
+msgid "Inventory Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:266
+msgid "Equipment Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:270
+msgid "Skill Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:274
+msgid "Minimap Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:278
+msgid "Chat Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:282
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:286
+msgid "Setup Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:290
+msgid "Debug Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:294
+msgid "Social Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:298
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:302
+msgid "Outfits Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:306
+msgid "Shop Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:310
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:314
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:318
+msgid "Commands Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:322
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:326
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:330
+msgid "Did you know Window"
+msgstr ""
+
+#: src/gui/setup_input.cpp:334
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/gui/setup_input.cpp:338
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/gui/setup_input.cpp:342
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/gui/setup_input.cpp:346
+msgid "Smilie"
+msgstr ""
+
+#: src/gui/setup_input.cpp:350 src/gui/setup_input.cpp:354
+#: src/gui/setup_input.cpp:358 src/gui/setup_input.cpp:362
+#: src/gui/setup_input.cpp:366 src/gui/setup_input.cpp:370
+#: src/gui/setup_input.cpp:374 src/gui/setup_input.cpp:378
+#: src/gui/setup_input.cpp:382 src/gui/setup_input.cpp:386
+#: src/gui/setup_input.cpp:390 src/gui/setup_input.cpp:394
+#: src/gui/setup_input.cpp:398 src/gui/setup_input.cpp:402
+#: src/gui/setup_input.cpp:406 src/gui/setup_input.cpp:410
+#: src/gui/setup_input.cpp:414 src/gui/setup_input.cpp:418
+#: src/gui/setup_input.cpp:422 src/gui/setup_input.cpp:426
+#: src/gui/setup_input.cpp:430 src/gui/setup_input.cpp:434
+#: src/gui/setup_input.cpp:438 src/gui/setup_input.cpp:442
+#: src/gui/setup_input.cpp:446 src/gui/setup_input.cpp:450
+#: src/gui/setup_input.cpp:454 src/gui/setup_input.cpp:458
+#: src/gui/setup_input.cpp:462 src/gui/setup_input.cpp:466
+#: src/gui/setup_input.cpp:470 src/gui/setup_input.cpp:474
+#: src/gui/setup_input.cpp:478 src/gui/setup_input.cpp:482
+#: src/gui/setup_input.cpp:486 src/gui/setup_input.cpp:490
+#: src/gui/setup_input.cpp:494 src/gui/setup_input.cpp:498
+#: src/gui/setup_input.cpp:502 src/gui/setup_input.cpp:506
+#: src/gui/setup_input.cpp:510 src/gui/setup_input.cpp:514
+#: src/gui/setup_input.cpp:518 src/gui/setup_input.cpp:522
+#: src/gui/setup_input.cpp:526 src/gui/setup_input.cpp:530
+#: src/gui/setup_input.cpp:534 src/gui/setup_input.cpp:538
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr ""
+
+#: src/gui/setup_input.cpp:542
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/gui/setup_input.cpp:546
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/gui/setup_input.cpp:550
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/gui/setup_input.cpp:554
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/gui/setup_input.cpp:558
+msgid "Chat Keys"
+msgstr ""
+
+#: src/gui/setup_input.cpp:562
+msgid "Toggle Chat"
+msgstr ""
+
+#: src/gui/setup_input.cpp:566
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: src/gui/setup_input.cpp:570
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: src/gui/setup_input.cpp:574
+msgid "Previous Chat Tab"
+msgstr ""
+
+#: src/gui/setup_input.cpp:578
+msgid "Next Chat Tab"
+msgstr ""
+
+#: src/gui/setup_input.cpp:582
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/gui/setup_input.cpp:586
+msgid "Previous chat line"
+msgstr ""
+
+#: src/gui/setup_input.cpp:590
+msgid "Next chat line"
+msgstr ""
+
+#: src/gui/setup_input.cpp:594
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/gui/setup_input.cpp:598
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/gui/setup_input.cpp:602
+msgid "Other Keys"
+msgstr ""
+
+#: src/gui/setup_input.cpp:606
+msgid "Ignore input 1"
+msgstr ""
+
+#: src/gui/setup_input.cpp:610
+msgid "Ignore input 2"
+msgstr ""
+
+#: src/gui/setup_input.cpp:614
+msgid "Direct Up"
+msgstr ""
+
+#: src/gui/setup_input.cpp:618
+msgid "Direct Down"
+msgstr ""
+
+#: src/gui/setup_input.cpp:622
+msgid "Direct Left"
+msgstr ""
+
+#: src/gui/setup_input.cpp:626
+msgid "Direct Right"
+msgstr ""
+
+#: src/gui/setup_input.cpp:630
+msgid "Crazy moves"
+msgstr ""
+
+#: src/gui/setup_input.cpp:634
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/gui/setup_input.cpp:638
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/gui/setup_input.cpp:642
+msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:80
-msgid "Keyboard"
+#: src/gui/setup_input.cpp:646
+msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:89
+#: src/gui/setup_input.cpp:650
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/gui/setup_input.cpp:654
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/gui/setup_input.cpp:658
+msgid "Use magic attack"
+msgstr ""
+
+#: src/gui/setup_input.cpp:662
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/gui/setup_input.cpp:666
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/gui/setup_input.cpp:670
+msgid "Change move type"
+msgstr ""
+
+#: src/gui/setup_input.cpp:674
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/gui/setup_input.cpp:678
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/gui/setup_input.cpp:682
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/gui/setup_input.cpp:686
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/gui/setup_input.cpp:690
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/gui/setup_input.cpp:694
+msgid "On / Off audio"
+msgstr ""
+
+#: src/gui/setup_input.cpp:698
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/gui/setup_input.cpp:702
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/gui/setup_input.cpp:706
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/gui/setup_input.cpp:710
+msgid "Modifier key"
+msgstr ""
+
+#: src/gui/setup_input.cpp:752
+msgid "Input"
+msgstr ""
+
+#: src/gui/setup_input.cpp:761
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:93
+#: src/gui/setup_input.cpp:765
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:97
+#: src/gui/setup_input.cpp:769
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:133
+#: src/gui/setup_input.cpp:809
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_input.cpp:810
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:47
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:122
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
+
 #: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
@@ -2253,39 +2678,75 @@ msgstr ""
 msgid "Windows"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Auto hide shortcuts buttons."
+#: src/gui/setup_other.cpp:168
+msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
-msgid "Enable server side attack"
+#: src/gui/setup_other.cpp:169
+msgid "Auto hide in small resolution"
+msgstr ""
+
+#: src/gui/setup_other.cpp:170
+msgid "Always auto hide"
+msgstr ""
+
+#: src/gui/setup_other.cpp:171
+msgid "Shortcut buttons"
 msgstr ""
 
 #: src/gui/setup_other.cpp:175
-msgid "Enable bot checker"
+msgid "Proxy server"
 msgstr ""
 
 #: src/gui/setup_other.cpp:178
+msgid "System proxy"
+msgstr ""
+
+#: src/gui/setup_other.cpp:179
+msgid "Direct connection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:185
+msgid "SOCKS5 hostname"
+msgstr ""
+
+#: src/gui/setup_other.cpp:186
+msgid "Proxy type"
+msgstr ""
+
+#: src/gui/setup_other.cpp:189
+msgid "Proxy address:port"
+msgstr ""
+
+#: src/gui/setup_other.cpp:195
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:198
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:201
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:205
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:208
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:211
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:192
+#: src/gui/setup_other.cpp:215
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:219
 msgid "Show background"
 msgstr ""
 
@@ -2676,70 +3137,74 @@ msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #: src/gui/setup_visual.cpp:56
+msgid "Blurring textures (OpenGL)"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:59
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:60
+#: src/gui/setup_visual.cpp:63
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:61
+#: src/gui/setup_visual.cpp:64
 msgid "Text"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:62
+#: src/gui/setup_visual.cpp:65
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:63
+#: src/gui/setup_visual.cpp:66
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:64
+#: src/gui/setup_visual.cpp:67
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:68 src/gui/setup_visual.cpp:93
+#: src/gui/setup_visual.cpp:71 src/gui/setup_visual.cpp:96
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:69 src/gui/setup_visual.cpp:78
+#: src/gui/setup_visual.cpp:72 src/gui/setup_visual.cpp:81
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:70 src/gui/setup_visual.cpp:80
+#: src/gui/setup_visual.cpp:73 src/gui/setup_visual.cpp:83
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:71
+#: src/gui/setup_visual.cpp:74
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:74
+#: src/gui/setup_visual.cpp:77
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:79
+#: src/gui/setup_visual.cpp:82
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:81
+#: src/gui/setup_visual.cpp:84
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:82
+#: src/gui/setup_visual.cpp:85
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:88
+#: src/gui/setup_visual.cpp:91
 msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:94
+#: src/gui/setup_visual.cpp:97
 msgid "on"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:95
+#: src/gui/setup_visual.cpp:98
 msgid "Vsync"
 msgstr ""
 
@@ -2767,17 +3232,17 @@ msgstr ""
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:760 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:762
+#: src/gui/shopwindow.cpp:761
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:84
 msgid "Skills"
 msgstr ""
 
@@ -2823,208 +3288,208 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:174
+#: src/gui/socialwindow.cpp:175
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:374
+#: src/gui/socialwindow.cpp:375
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:389
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:417
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:427
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:650
+#: src/gui/socialwindow.cpp:651
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:928
+#: src/gui/socialwindow.cpp:929
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:969
+#: src/gui/socialwindow.cpp:970
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1001
+#: src/gui/socialwindow.cpp:1002
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1036
+#: src/gui/socialwindow.cpp:1037
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1198 src/gui/socialwindow.cpp:1633
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
+#: src/gui/socialwindow.cpp:1240 src/gui/windowmenu.cpp:96
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1262
+#: src/gui/socialwindow.cpp:1263
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1282
+#: src/gui/socialwindow.cpp:1283
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1415
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1426
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1442
+#: src/gui/socialwindow.cpp:1443
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1456
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1502
+#: src/gui/socialwindow.cpp:1503
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1525
+#: src/gui/socialwindow.cpp:1526
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1540
+#: src/gui/socialwindow.cpp:1541
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1554
+#: src/gui/socialwindow.cpp:1555
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1560
+#: src/gui/socialwindow.cpp:1561
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1566
+#: src/gui/socialwindow.cpp:1567
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1581
+#: src/gui/socialwindow.cpp:1582
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1593
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1596
+#: src/gui/socialwindow.cpp:1597
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1604
+#: src/gui/socialwindow.cpp:1605
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1609
+#: src/gui/socialwindow.cpp:1610
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1618
+#: src/gui/socialwindow.cpp:1619
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1633
+#: src/gui/socialwindow.cpp:1634
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1639
+#: src/gui/socialwindow.cpp:1640
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:91
 msgid "Specials"
 msgstr ""
 
@@ -3184,24 +3649,24 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
+#: src/gui/tradewindow.cpp:112 src/gui/tradewindow.cpp:168
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:112
+#: src/gui/tradewindow.cpp:113
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:116
+#: src/gui/tradewindow.cpp:117
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:375
+#: src/gui/tradewindow.cpp:376
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:454
+#: src/gui/tradewindow.cpp:455
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -3388,23 +3853,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:616
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:103
+#: src/gui/whoisonline.cpp:104
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:630
+#: src/gui/whoisonline.cpp:632
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:670
+#: src/gui/whoisonline.cpp:672
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3494,16 +3959,16 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:151
+#: src/gui/widgets/chattab.cpp:150
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:157
+#: src/gui/widgets/chattab.cpp:156
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:184
+#: src/gui/widgets/chattab.cpp:183
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
@@ -3579,83 +4044,83 @@ msgstr ""
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:68
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:68
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:70
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:74
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:75
+#: src/gui/windowmenu.cpp:76
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:75
+#: src/gui/windowmenu.cpp:76
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:77
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:79
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:84
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:91
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:96
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:97
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:97
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:99
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:101
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:101
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:103
 msgid "SET"
 msgstr ""
 
@@ -3671,779 +4136,376 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:252
-msgid "Storage"
-msgstr ""
-
-#: src/inventory.cpp:254
-msgid "Cart"
-msgstr ""
-
-#: src/keyboardconfig.cpp:72 src/keyboarddata.h:497 src/keyboarddata.h:503
-#: src/keyboarddata.h:509 src/keyboarddata.h:515 src/keyboarddata.h:521
-#: src/keyboarddata.h:527 src/keyboarddata.h:533 src/keyboarddata.h:539
-#: src/keyboarddata.h:545 src/keyboarddata.h:551 src/keyboarddata.h:557
-#: src/keyboarddata.h:563 src/keyboarddata.h:569 src/keyboarddata.h:575
-#: src/keyboarddata.h:581 src/keyboarddata.h:587 src/keyboarddata.h:593
-#: src/keyboarddata.h:599 src/keyboarddata.h:605 src/keyboarddata.h:611
-#: src/keyboarddata.h:617 src/keyboarddata.h:623 src/keyboarddata.h:629
-#: src/keyboarddata.h:635 src/keyboarddata.h:641 src/keyboarddata.h:647
-#: src/keyboarddata.h:653 src/keyboarddata.h:659 src/keyboarddata.h:665
-#: src/keyboarddata.h:671 src/keyboarddata.h:677 src/keyboarddata.h:683
-#: src/keyboarddata.h:689 src/keyboarddata.h:695 src/keyboarddata.h:701
-#: src/keyboarddata.h:707 src/keyboarddata.h:713 src/keyboarddata.h:719
-#: src/keyboarddata.h:725 src/keyboarddata.h:731 src/keyboarddata.h:737
-#: src/keyboarddata.h:743 src/keyboarddata.h:749 src/keyboarddata.h:755
-#: src/keyboarddata.h:761 src/keyboarddata.h:767 src/keyboarddata.h:773
-#: src/keyboarddata.h:779
+#: src/inputmanager.cpp:283 src/inputmanager.cpp:321 src/keyboardconfig.cpp:81
 #, c-format
-msgid "Emote Shortcut %d"
+msgid "key_%d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77 src/keyboarddata.h:227 src/keyboarddata.h:233
-#: src/keyboarddata.h:239 src/keyboarddata.h:245 src/keyboarddata.h:251
-#: src/keyboarddata.h:257 src/keyboarddata.h:263 src/keyboarddata.h:269
-#: src/keyboarddata.h:275 src/keyboarddata.h:281 src/keyboarddata.h:287
-#: src/keyboarddata.h:293 src/keyboarddata.h:299 src/keyboarddata.h:305
-#: src/keyboarddata.h:311 src/keyboarddata.h:317 src/keyboarddata.h:323
-#: src/keyboarddata.h:329 src/keyboarddata.h:335 src/keyboarddata.h:341
+#. TRANSLATORS: this is long joystick button name
+#: src/inputmanager.cpp:288
 #, c-format
-msgid "Item Shortcut %d"
+msgid "JButton%d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
+#: src/inputmanager.cpp:300
+msgid "unknown key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:201
+#. TRANSLATORS: this is short joystick button name
+#: src/inputmanager.cpp:327
 #, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:203
-msgid "unknown key"
+msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+#: src/inputmanager.cpp:339 src/keyboardconfig.cpp:93
 msgid "u key"
 msgstr ""
 
-#: src/keyboarddata.h:52
-msgid "Basic Keys"
-msgstr ""
-
-#: src/keyboarddata.h:58
-msgid "Move Up"
-msgstr ""
-
-#: src/keyboarddata.h:64
-msgid "Move Down"
-msgstr ""
-
-#: src/keyboarddata.h:70
-msgid "Move Left"
-msgstr ""
-
-#: src/keyboarddata.h:76
-msgid "Move Right"
-msgstr ""
-
-#: src/keyboarddata.h:88
-msgid "Target & Attack"
-msgstr ""
-
-#: src/keyboarddata.h:94
-msgid "Move to Target"
-msgstr ""
-
-#: src/keyboarddata.h:100
-msgid "Change Move to Target type"
-msgstr ""
-
-#: src/keyboarddata.h:106
-msgid "Move to Home location"
-msgstr ""
-
-#: src/keyboarddata.h:112
-msgid "Set home location"
-msgstr ""
-
-#: src/keyboarddata.h:118
-msgid "Move to navigation point"
-msgstr ""
-
-#: src/keyboarddata.h:130
-msgid "Stop Attack"
-msgstr ""
-
-#: src/keyboarddata.h:136
-msgid "Untarget"
-msgstr ""
-
-#: src/keyboarddata.h:142
-msgid "Target Closest"
-msgstr ""
-
-#: src/keyboarddata.h:148
-msgid "Target NPC"
-msgstr ""
-
-#: src/keyboarddata.h:154
-msgid "Target Player"
-msgstr ""
-
-#: src/keyboarddata.h:160
-msgid "Pickup"
-msgstr ""
-
-#: src/keyboarddata.h:166
-msgid "Change Pickup Type"
-msgstr ""
-
-#: src/keyboarddata.h:172
-msgid "Hide Windows"
-msgstr ""
-
-#: src/keyboarddata.h:178
-msgid "Sit"
-msgstr ""
-
-#: src/keyboarddata.h:184
-msgid "Screenshot"
-msgstr ""
-
-#: src/keyboarddata.h:190
-msgid "Enable/Disable Trading"
-msgstr ""
-
-#: src/keyboarddata.h:196
-msgid "Change Map View Mode"
-msgstr ""
-
-#: src/keyboarddata.h:202
-msgid "Select OK"
-msgstr ""
-
-#: src/keyboarddata.h:215
-msgid "Shortcuts Keys"
-msgstr ""
-
-#: src/keyboarddata.h:221
-msgid "Item Shortcuts Key"
-msgstr ""
-
-#: src/keyboarddata.h:347
-msgid "Windows Keys"
-msgstr ""
-
-#: src/keyboarddata.h:353
-msgid "Help Window"
-msgstr ""
-
-#: src/keyboarddata.h:359
-msgid "Status Window"
-msgstr ""
-
-#: src/keyboarddata.h:365
-msgid "Inventory Window"
-msgstr ""
-
-#: src/keyboarddata.h:371
-msgid "Equipment Window"
-msgstr ""
-
-#: src/keyboarddata.h:377
-msgid "Skill Window"
-msgstr ""
-
-#: src/keyboarddata.h:383
-msgid "Minimap Window"
-msgstr ""
-
-#: src/keyboarddata.h:389
-msgid "Chat Window"
-msgstr ""
-
-#: src/keyboarddata.h:395
-msgid "Item Shortcut Window"
-msgstr ""
-
-#: src/keyboarddata.h:401
-msgid "Setup Window"
-msgstr ""
-
-#: src/keyboarddata.h:407
-msgid "Debug Window"
-msgstr ""
-
-#: src/keyboarddata.h:413
-msgid "Social Window"
-msgstr ""
-
-#: src/keyboarddata.h:419
-msgid "Emote Shortcut Window"
-msgstr ""
-
-#: src/keyboarddata.h:425
-msgid "Outfits Window"
-msgstr ""
-
-#: src/keyboarddata.h:431
-msgid "Shop Window"
-msgstr ""
-
-#: src/keyboarddata.h:437
-msgid "Quick drop Window"
-msgstr ""
-
-#: src/keyboarddata.h:443
-msgid "Kill Stats Window"
-msgstr ""
-
-#: src/keyboarddata.h:449
-msgid "Commands Window"
-msgstr ""
-
-#: src/keyboarddata.h:455
-msgid "Bot Checker Window"
-msgstr ""
-
-#: src/keyboarddata.h:461
-msgid "Who Is Online Window"
-msgstr ""
-
-#: src/keyboarddata.h:467
-msgid "Did you know Window"
-msgstr ""
-
-#: src/keyboarddata.h:473
-msgid "Previous Social Tab"
-msgstr ""
-
-#: src/keyboarddata.h:479
-msgid "Next Social Tab"
-msgstr ""
-
-#: src/keyboarddata.h:485
-msgid "Emotes Keys"
-msgstr ""
-
-#: src/keyboarddata.h:491
-msgid "Smilie"
-msgstr ""
-
-#: src/keyboarddata.h:785
-msgid "Outfits Keys"
-msgstr ""
-
-#: src/keyboarddata.h:790
-msgid "Wear Outfit"
-msgstr ""
-
-#: src/keyboarddata.h:793
-msgid "Copy Outfit"
-msgstr ""
-
-#: src/keyboarddata.h:797
-msgid "Copy equipped to Outfit"
-msgstr ""
-
-#: src/keyboarddata.h:802
-msgid "Chat Keys"
-msgstr ""
-
-#: src/keyboarddata.h:805
-msgid "Toggle Chat"
-msgstr ""
-
-#: src/keyboarddata.h:811
-msgid "Scroll Chat Up"
-msgstr ""
-
-#: src/keyboarddata.h:817
-msgid "Scroll Chat Down"
-msgstr ""
-
-#: src/keyboarddata.h:823
-msgid "Previous Chat Tab"
-msgstr ""
-
-#: src/keyboarddata.h:829
-msgid "Next Chat Tab"
-msgstr ""
-
-#: src/keyboarddata.h:835
-msgid "Close current Chat Tab"
-msgstr ""
-
-#: src/keyboarddata.h:840
-msgid "Previous chat line"
-msgstr ""
-
-#: src/keyboarddata.h:843
-msgid "Next chat line"
-msgstr ""
-
-#: src/keyboarddata.h:846
-msgid "Chat Auto Complete"
-msgstr ""
-
-#: src/keyboarddata.h:849
-msgid "Deactivate Chat Input"
-msgstr ""
-
-#: src/keyboarddata.h:852
-msgid "Other Keys"
-msgstr ""
-
-#: src/keyboarddata.h:855
-msgid "Ignore input 1"
-msgstr ""
-
-#: src/keyboarddata.h:861
-msgid "Ignore input 2"
-msgstr ""
-
-#: src/keyboarddata.h:867
-msgid "Direct Up"
-msgstr ""
-
-#: src/keyboarddata.h:873
-msgid "Direct Down"
-msgstr ""
-
-#: src/keyboarddata.h:879
-msgid "Direct Left"
-msgstr ""
-
-#: src/keyboarddata.h:885
-msgid "Direct Right"
-msgstr ""
-
-#: src/keyboarddata.h:891
-msgid "Crazy moves"
-msgstr ""
-
-#: src/keyboarddata.h:897
-msgid "Change Crazy Move mode"
-msgstr ""
-
-#: src/keyboarddata.h:903
-msgid "Quick Drop N Items from 0 slot"
-msgstr ""
-
-#: src/keyboarddata.h:909
-msgid "Quick Drop N Items"
-msgstr ""
-
-#: src/keyboarddata.h:915
-msgid "Switch Quick Drop Counter"
-msgstr ""
-
-#: src/keyboarddata.h:921
-msgid "Quick heal target or self"
-msgstr ""
-
-#: src/keyboarddata.h:927
-msgid "Use #itenplz spell"
-msgstr ""
-
-#: src/keyboarddata.h:933
-msgid "Use magic attack"
-msgstr ""
-
-#: src/keyboarddata.h:939
-msgid "Switch magic attack"
-msgstr ""
-
-#: src/keyboarddata.h:945
-msgid "Switch pvp attack"
-msgstr ""
-
-#: src/keyboarddata.h:951
-msgid "Change move type"
-msgstr ""
-
-#: src/keyboarddata.h:957
-msgid "Change Attack Weapon Type"
-msgstr ""
-
-#: src/keyboarddata.h:963
-msgid "Change Attack Type"
-msgstr ""
-
-#: src/keyboarddata.h:969
-msgid "Change Follow mode"
-msgstr ""
-
-#: src/keyboarddata.h:975
-msgid "Change Imitation mode"
-msgstr ""
-
-#: src/keyboarddata.h:981
-msgid "Disable / Enable Game modifier keys"
-msgstr ""
-
-#: src/keyboarddata.h:987
-msgid "On / Off audio"
-msgstr ""
-
-#: src/keyboarddata.h:993
-msgid "Enable / Disable away mode"
-msgstr ""
-
-#: src/keyboarddata.h:999
-msgid "Emulate right click from keyboard"
-msgstr ""
-
-#: src/keyboarddata.h:1005
-msgid "Toggle camera mode"
+#: src/inventory.cpp:252
+msgid "Storage"
 msgstr ""
 
-#: src/keyboarddata.h:1011
-msgid "Modifier key"
+#: src/inventory.cpp:254
+msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:376
+#: src/localplayer.cpp:378
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1431
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1437
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1473
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1675 src/localplayer.cpp:1709 src/localplayer.cpp:1710
+#: src/localplayer.cpp:1677 src/localplayer.cpp:1711 src/localplayer.cpp:1712
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1715 src/localplayer.cpp:1722 src/localplayer.cpp:1729
+#: src/localplayer.cpp:1717 src/localplayer.cpp:1724 src/localplayer.cpp:1731
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1904
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1905
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1906
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1907
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1908
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1909
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1931
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1936
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1940
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1954
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1955
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1956
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1957
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1958
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1959
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1960
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1961
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1962
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1981
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1982
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1983
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1984
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1985
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2004 src/localplayer.cpp:2008 src/localplayer.cpp:2031
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2005 src/localplayer.cpp:2027
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2006
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2007
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2028
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2029
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2030
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2082
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2083
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2084
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2085
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2086
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2087
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2088
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2089
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2102
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2103
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2104
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2105
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2106
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2107
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2126
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2127
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2128
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2129
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2130
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2131
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2148
+#: src/localplayer.cpp:2150
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2151
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2152
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2153
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2154
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2171
+#: src/localplayer.cpp:2173
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2174
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2175
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2201
+#: src/localplayer.cpp:2203
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2221
+#: src/localplayer.cpp:2223
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2224
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2223 src/localplayer.cpp:2238
+#: src/localplayer.cpp:2225 src/localplayer.cpp:2240
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2238
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2239
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2262
+#: src/localplayer.cpp:2264
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2265
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3778
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3780 src/localplayer.cpp:3795
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3787
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3789 src/localplayer.cpp:3797
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4146
+#: src/localplayer.cpp:4151
 msgid "You see "
 msgstr ""
 
@@ -5285,7 +5347,7 @@ msgstr ""
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
 msgid "Strength"
 msgstr ""
 
@@ -5294,7 +5356,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
 msgid "Agility"
 msgstr ""
 
@@ -5303,7 +5365,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
 msgid "Dexterity"
 msgstr ""
 
@@ -5312,7 +5374,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
 msgid "Vitality"
 msgstr ""
 
@@ -5321,7 +5383,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
 msgid "Intelligence"
 msgstr ""
 
@@ -5649,54 +5711,54 @@ msgstr ""
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:235
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:277
+#: src/net/tmwa/generalhandler.cpp:276
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:278
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:280
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:282
+#: src/net/tmwa/generalhandler.cpp:281
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:284
+#: src/net/tmwa/generalhandler.cpp:283
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:286
+#: src/net/tmwa/generalhandler.cpp:285
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:288
+#: src/net/tmwa/generalhandler.cpp:287
 msgid "Damage per sec."
 msgstr ""