Rebuild and update translations.

41 files changed, 11654 insertions, 11492 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f09dd3314..799c249a3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+src/actionmanager.cpp
 src/actorspritemanager.cpp
 src/being.cpp
 src/client.cpp
@@ -77,6 +78,7 @@ src/gui/windowmenu.cpp
 src/gui/worldselectdialog.cpp
 src/inventory.cpp
 src/keyboardconfig.cpp
+src/keyboarddata.h
 src/localplayer.cpp
 src/logger.h
 src/main.cpp
diff --git a/po/ar.po b/po/ar.po
index ef47b905e..abd35e0eb 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "تثبيت"
 
@@ -339,43 +347,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -409,13 +409,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -469,7 +469,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "مغادرة"
 
@@ -583,14 +583,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -624,8 +624,8 @@ msgid "Female"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -703,64 +703,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -770,16 +770,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -952,25 +952,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -1004,17 +1004,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "العتاد"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1038,7 +1038,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "الجردة"
@@ -1051,20 +1051,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "استخدام"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1075,7 +1075,7 @@ msgstr ""
 msgid "Split"
 msgstr "قسم"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1084,7 +1084,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1094,9 +1094,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "إسقاط"
 
@@ -1145,7 +1145,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1363,22 +1363,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1587,7 +1587,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1914,103 +1914,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2269,35 +2277,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2789,7 +2805,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "مهارات"
 
@@ -2928,7 +2944,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3036,7 +3052,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3417,7 +3433,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3593,83 +3609,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "الحالة"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3693,447 +3709,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/bg.po b/po/bg.po
index 744238f94..12c64376a 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr ""
 
@@ -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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1031,20 +1031,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2900,7 +2916,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/ca.po b/po/ca.po
index 147b5e6c8..3c9bbc2aa 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "sortir"
 
@@ -563,14 +563,14 @@ msgstr "nom"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1031,20 +1031,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2900,7 +2916,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/cs.po b/po/cs.po
index b13fb5b6c..8559b7021 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/language/"
 "cs/)\n"
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorovat příchozí žádosti o obchodování"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Akceptovat příchozí žádosti o obchodování"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
@@ -38,16 +46,16 @@ msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Nastavení"
 
@@ -329,43 +337,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Snímky obrazovky ukládat jako "
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorovat příchozí žádosti o obchodování"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Akceptovat příchozí žádosti o obchodování"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Nelze načíst mapu"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
@@ -399,13 +399,13 @@ msgid "Name"
 msgstr "Jméno"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Útok"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Mluvit"
 
@@ -459,7 +459,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Ukončit"
 
@@ -573,14 +573,14 @@ msgstr "Jméno:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -614,8 +614,8 @@ msgid "Female"
 msgstr "Žena"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Ostatní"
 
@@ -693,64 +693,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "výchozí"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "černá"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "červená"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "zelená"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "modrá"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "zlatá"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "žlutá"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "růžová"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "fialová"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "šedá"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "hnědá"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "duhová 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "duhová 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "duhová 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -760,16 +760,16 @@ msgstr "duhová 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomno: %s; %d hráčů je přítomno."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
@@ -942,25 +942,25 @@ msgstr "Příchozí: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Odchozí: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "Víte že ... ?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Předchozí"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Další >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Automaticky otevírat toto okno"
 
@@ -994,17 +994,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Odstranit z vybavení"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Pomoc"
 
@@ -1028,7 +1028,7 @@ msgstr "dle množství"
 msgid "by type"
 msgstr "dle typu"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventář"
@@ -1041,20 +1041,20 @@ msgstr "Sloty:"
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Použít"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1065,7 +1065,7 @@ msgstr "Upustit..."
 msgid "Split"
 msgstr "Rozdělit"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Výstroje"
@@ -1074,7 +1074,7 @@ msgstr "Výstroje"
 msgid "Weight:"
 msgstr "Hmotnost:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1084,9 +1084,9 @@ msgstr "Uložit"
 msgid "Retrieve"
 msgstr "Vzít"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Upustit"
 
@@ -1135,7 +1135,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr "Váha: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Statistiky zabíjení"
 
@@ -1347,22 +1347,22 @@ msgstr "Odeslat"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Odeslání se nezdařilo. odesílatel nebo dopis není platný."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Výstroj: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Klávesa: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Nejdřív odstrojit"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Výstroj pro \"Away\""
 
@@ -1571,7 +1571,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Kouzla"
 
@@ -1898,103 +1898,111 @@ msgstr "Povolit mumble hlasový chat"
 msgid "Download music"
 msgstr "Stahovat hudbu"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Odstranit barvy z příchozích zpráv"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Zobrazit seznam barev"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Příkazy"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Povolit magii a GM příkazy ve všech záložkách"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Omezení"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Omezit maximum znaků na řádek"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Omezit počet řádků chatu"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Záznamy"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Zapnout zaznamenávání konverzace"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Zobrazovat historii chatu"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Zprávy"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Skrýt obchodní zprávy"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Záložky"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Všechy šeptání jako záložky"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Zaznamenávat zprávy o magii v debug záložce"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Zobrazovat serverové zprávy v debug záložce"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Zapnout obchodní záložku"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Zapnout bitevní záložku"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Zobrazovat bitevní události"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Změnit velikost záložek pokud nutno"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Čas"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Použít místní čas"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "Zvýrazňovaná slova (oddělená čárkou)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2253,35 +2261,43 @@ msgstr "Zapnout podporu AuctionBot-a"
 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:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Zapnout ověřovač botů"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Zapnout debug záznam"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Mód nízké síťvé náročnosti"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Skrýt zobrazení štítu"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Zobrazit pozadí"
 
@@ -2776,7 +2792,7 @@ msgstr "Požadavek k obchodování"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s %s příjímáte?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -2915,7 +2931,7 @@ msgstr "Vytvořit gildu"
 msgid "Create Party"
 msgstr "Vytvořit partu"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Společenství"
 
@@ -3023,7 +3039,7 @@ msgstr "Jméno party"
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3403,7 +3419,7 @@ msgstr "Kdo je online - "
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3578,83 +3594,83 @@ msgstr ""
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Ověřovač botů"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Kdo je online"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Smajlíci"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Zkratky"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "Víte že"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3678,449 +3694,437 @@ msgstr "Úložiště"
 msgid "Cart"
 msgstr "Košík"
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Zkratka smajlíku %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
+"chovat podivně."
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Pohyb nahoru"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Pohyb dolů"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Pohyb vlevo"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Pohyb vpravo"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Cíl & Útok"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Přejít k cíli"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Změnit typ přesunu k cíli"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "Přejít na domácí místo"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "Nastavit domácí místo"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Zastavit Útok"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Zaměřit nejbližší"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Zaměřit NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Zaměřit hráče"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Sebrat"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Změnit typ sběru"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Skrýt okna"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Sednout si"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Zapnout/Vypnout obchody"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Změnit mód zobrazení mapy"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Vybrat OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Okno nápovědy"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Stavové okno"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Okno inventáře"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Okno vybavení"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Okno dovedností"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Okno s minimapou"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Okno s chatem"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Okno nastavení"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Debug okno"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Okno spolešenství"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Okno zkratek smajlíků"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Okno výstroje"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "Okno s obchodem"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Okno \"Kdo je online\""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Okno \"Víte že...\""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "Předchozí záložka společenství"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "Další záložka společenství"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Smajlíky"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Zkratka smajlíku %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Obléct výstroj"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Kopírovat výstroj"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Kopírovat výbavu do výstroje"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Přepnout chat"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Rolovat chat nahoru"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Rolovat chat dolů"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Předchozí záložka chatu"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Další záložka chatu"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Zavřít stávající záložku chatu"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Předchozí řádek chatu"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Další řádek chatu"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "Autodoplňování v chatu"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "Deaktivovat vstup chatu"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignorovat vstup 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignorovat vstup 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "Otočit nahoru"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "Otočit dolů"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "Otočit vlevo"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "Otočit vpravo"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "Šílené pohyby"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "Změnit mód šílených pohybů"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Rychlé léčení cíle nebo sebe"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Použít kouzlo #itenplz"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Použít magický útok"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "Přepnout magický útok"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "Změnit typ pohybu"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "Změnit typ útočné zbraně"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "Změnit typ útoku"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "Změnit mód následování"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "Změnit mód imitace"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "Zapnout/Vypnout audio"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Zapnout/Vypnout Away mód"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "Emulovat pravý klik z klávesnice"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "přemnout mód kamery"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "Klávesa modifikátoru"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
-"chovat podivně."
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/da.po b/po/da.po
index 3a50e1902..637290c3b 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/manaplus/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,14 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorerer indkomne handels anmodninger"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Accepterer indkomne handels anmodninger"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -36,16 +44,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Opsætning"
 
@@ -320,43 +328,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Netværksfejl"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorerer indkomne handels anmodninger"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Accepterer indkomne handels anmodninger"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunne ikke loade %s."
@@ -390,13 +390,13 @@ msgid "Name"
 msgstr "Navn"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Angrib"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Snak"
 
@@ -450,7 +450,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Afslut"
 
@@ -564,14 +564,14 @@ msgstr "Navn:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -605,8 +605,8 @@ msgid "Female"
 msgstr "Kvinde"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -684,64 +684,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -751,16 +751,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
@@ -933,25 +933,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Luk"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -985,17 +985,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Tag af"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Hjælp"
 
@@ -1019,7 +1019,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventarliste"
@@ -1032,20 +1032,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Brug"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Split"
 msgstr "Opdel"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1065,7 +1065,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "Vægt:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1075,9 +1075,9 @@ msgstr "Gem på lager"
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Smid"
 
@@ -1126,7 +1126,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1336,22 +1336,22 @@ 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:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1560,7 +1560,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1887,103 +1887,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Farver"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Placer alle hviskesamtaler i en tab"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2242,35 +2250,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2762,7 +2778,7 @@ msgstr "Anmodning om byttehandel."
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Færdigheder"
 
@@ -2901,7 +2917,7 @@ msgstr "Opret en guild"
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3009,7 +3025,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3390,7 +3406,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3566,83 +3582,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3666,447 +3682,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Shortcut %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Flyt op"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Flyt ned"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Flyt til højre"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Vælg modstander og angrib"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Stop angreb"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Vælg NPC som ny modstander"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Vælg spiller som ny modstander"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Saml op"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Gem vinduer"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Sid"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Gem skærmbillede som fil"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Slå handler fra/til"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Vælg OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Shortcut %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Hjælpevindue"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Statsvindue"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Færdigheds-vindue"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Minikort"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Chat-vindue"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Opsætnings-vindue"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Debug-vindue"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Smiley"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Slå chat til eller fra"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Scroll chat op"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Scroll chat ned"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Gå til sidste chat tab"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Gå til næste chat tab"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/de.po b/po/de.po
index 811a51fcf..30e52ebb6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/language/"
 "de/)\n"
@@ -25,6 +25,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignoriere eingehende Handelsanfragen"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Akzeptiere eingehende Handelsanfragen"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Sichtbar au der Karte"
@@ -42,16 +50,16 @@ msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -330,43 +338,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Allgemein"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto gespeichert unter"
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignoriere eingehende Handelsanfragen"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Akzeptiere eingehende Handelsanfragen"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden."
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -400,13 +400,13 @@ msgid "Name"
 msgstr "Name"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Angriff"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Sprechen"
 
@@ -460,7 +460,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Beenden"
 
@@ -574,14 +574,14 @@ msgstr "Name :"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -615,8 +615,8 @@ msgid "Female"
 msgstr "Weiblich"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Sonstig"
 
@@ -694,64 +694,64 @@ msgstr "Level: %d"
 msgid "(empty)"
 msgstr "(leer)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "Standard"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "schwarz"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "rot"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "grün"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "blau"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "gold"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "gelb"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "rosa"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "lila"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "grau"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "braun"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "Regenbogen 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "Regenbogen 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "Regenbogen 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -761,16 +761,16 @@ msgstr "Regenbogen 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -943,25 +943,25 @@ msgstr "Eingehend: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Ausgehend: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "Wusstest du schon?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Zurück"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Vor >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Öffne dieses Fenster automatisch"
 
@@ -995,17 +995,17 @@ msgstr "Beschreibung:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Hilfe"
 
@@ -1029,7 +1029,7 @@ msgstr "nach Anzahl"
 msgid "by type"
 msgstr "nach Art"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventar"
@@ -1042,20 +1042,20 @@ msgstr "Plätze:"
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1066,7 +1066,7 @@ msgstr "Wegwerfen"
 msgid "Split"
 msgstr "Aufteilen"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Ausrüstung"
@@ -1075,7 +1075,7 @@ msgstr "Ausrüstung"
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1085,9 +1085,9 @@ msgstr "Aufbewahren"
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Wegwerfen"
 
@@ -1136,7 +1136,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Besiegte Gegner Statistik"
 
@@ -1346,22 +1346,22 @@ msgstr "Senden"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Es misslang den Brief zu senden oder er war ungültig."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Ausrüstung: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Taste: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Zuerst ausziehen"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Abwesend-Outfit"
 
@@ -1570,7 +1570,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Zaubersprüche"
 
@@ -1897,103 +1897,111 @@ msgstr "\"mumble voice chat\" einschalten"
 msgid "Download music"
 msgstr "Lade Musik herunter"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Farben"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Farben bei eingehenden Nachrichten abschalten"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Zeige Chatfarben-Liste"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Befehle"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Lasse magische und GM-Nachrichten in allen Chat Tabs zu"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Limit"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Limitiere max Zeichen in Chatzeile"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Limitiere max Zeilen im Chat"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Logs"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Aufzeichnen des Chats einschalten"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Zeige Chat-Historie"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Verstecke Laden-Mitteilungen"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Tabs"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Alle privaten Nachrichten in Tabs öffnen"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Aufzeichnen der magischen Nachrichten im \"Debug Tab\""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Zeige Servermitteilungen im \"Debug Tab\""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Handel-Tab einschalten"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Kampf-Tab einschalten"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Zeige Kampf-Ereignisse"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Größe der Chat-Tabs anpassen"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Zeit"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Benutze lokale Zeit"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "Wörter hervorheben (welche mit Komma getrennt sind)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2252,35 +2260,43 @@ msgstr "Aktiviere auction bot unterstützung"
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Erlaube Gilden-Bot und deaktiviere nativen Gilden-Support"
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "Aktiviere Angriff trotz Verzögerung"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Botprüfer einschalten"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Debug-Protokoll benutzen"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Niedriger Datenverkehr Modus"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Zeige das Schild nicht an"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Zeige Hintergrund"
 
@@ -2780,7 +2796,7 @@ msgstr "Erbitte einen Handel"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s möchte %s %s akzeptierst du?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Fähigkeiten"
 
@@ -2919,7 +2935,7 @@ msgstr "Gilde erstellen"
 msgid "Create Party"
 msgstr "Party erstellen"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Sozial"
 
@@ -3027,7 +3043,7 @@ msgstr "Partyname"
 msgid "Choose your party's name."
 msgstr "Name deiner Party wählen."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Special"
 
@@ -3409,7 +3425,7 @@ msgstr "Wer ist Online -"
 msgid "Who Is Online - error"
 msgstr "Wer ist Online - Fehler"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Wer ist Online - Aktualisiere"
 
@@ -3591,83 +3607,83 @@ msgstr ""
 "Dieser Kommando stoppt das Ignorieren eines Spielers, sofern er ignoriert "
 "wird."
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "BP"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Bot Überprüfer"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Wer ist Online"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "BGS"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Similies"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "FÄH"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "SOZ"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "TK"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Tastenkürzel"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "ZS"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "WW"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "WS"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "Wusstest du schon"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "EINST"
 
@@ -3691,449 +3707,437 @@ msgstr "Lager"
 msgid "Cart"
 msgstr "Einkaufswagen"
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Gefühlstaste %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Kurztaste %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder "
+"das Spiel lässt sich nicht richtig steuern."
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "Normale Tasten"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Laufe Hoch"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Laufe Runter"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Laufe nach Links"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Laufe nach Rechts"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Zielen & Angreifen"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Gehe zu Ziel"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Verändere Bewege dich zum Ziel-Typus"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "Gehe zu Stammplatz"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "Setzte Stammplatz"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "Bewege zum Navigationspunkt"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Angriff abbrechen"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr "Deselektieren"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Markiere Nähesten"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "NPC anvisieren"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Spieler anvisieren"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Aufheben"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Verändere den Aufnahme-Typ"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Fenster ausblenden"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Sitzen"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Handeln erlauben/verbieten"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Wechsle Ansichtsmodus der Karte"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "OK auswählen"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "Tastenkürzel"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "Item-Tastenkürzel"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Kurztaste %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "Fenster Tasten"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Hilfefenster"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Statusfenster"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Inventarfenster"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Ausrüstungsfenster"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Fertigkeitenfenster"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Kartenfenster"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Chatfenster"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Kurztastenfenster"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Einstellungen"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Debugfenster"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Gesellschaftsfenster"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Kurztasten für Gefühle"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Kleidungs Fenster"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "Kauf Fenster"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "Schnelles wegwerfen Fenster"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "Besiegte Gegner Fenster"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "Befehls Fenster"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "Bot Prüfer Fenster"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Wer ist Online Fenster"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Wusstest du schon Fenster"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "Vorheriger Gesellschaftstab"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "Nächster Gesellschaftstab"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "Emotons Tasten"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Grinsen"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "Outfit Tasten"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Ausrüstung anziehen"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Ausrüstung kopieren"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Kopiere aktuelle Ausrüstung  zum outfit Auswahldialog"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "Chat Tasten"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Im Chat hochscrollen"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Im Chat runter scrollen"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Schließe aktuellen Tab"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Vorherige Chat-Zeile"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Nächste Chat-Zeile"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "Chat Autovervollständigung"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "Deaktiviere Chateingabe"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "Andere Tasten"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignoriere Eingabe 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "Richtung oben"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "Richtung unten"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "Richtung links"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "Richtung rechts"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "Verrückte Bewegungen"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "Verändere den verrückte Bewegungen-Modus"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Lass N Items von Slot 0 fallen"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Lass N Items fallen"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Heile Ziel/dich selbst"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Benutze #itenplz Spruch"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Benutze magische Angriff"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "Wechsle magische Angriff"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr "Wechsle PVP Attacke"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "Wechsle die Bewegungsart"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "Verändere die Angriffswaffe"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "Wechsle Angriffsart"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "Wechle Folgenmodus"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "Wechsle Imitierenmodus"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr "Aktiviere / Deaktiviere Spielmodifikations Tasten"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "An/Aus Audio"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Aktiviere/Deaktiviere abwesend Modus"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "Emuliere Rechts-Klick mit der Tastatur"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "Ändere Kameramodus"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder "
-"das Spiel lässt sich nicht richtig steuern."
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/el.po b/po/el.po
index bfb0c9eec..e54fc5c31 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/manaplus/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Αποδεχόμενος τα εισερχόμενα αιτήματα του εμπορίου"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr "αστοχία"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Ρύθμισεις"
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Γενικά"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Αποσφαλμάτωση"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Φωτογραφία αποθηκεύτηκε ως"
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Σώσιμο φωτογραφίας απέτυχε"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "Η σύνδεση με το διακομιστή χάθηκε."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Σφάλμα δικτύου"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Αποδεχόμενος τα εισερχόμενα αιτήματα του εμπορίου"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Δε μπορεί να φορτώθει ο χάρτης"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Σφάλμα κατά τη φόρτωση %s"
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr "Όνομα"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Επίθεση"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Συζήτηση"
 
@@ -449,7 +449,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Έξοδος"
 
@@ -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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr "Γυναίκα"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr "Επίπεδο %d"
 msgid "(empty)"
 msgstr "(Άδειο)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "προεπιλογή"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "μαύρο"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "κόκκινο"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "πράσινο"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "μπλε"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "χρυσό"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "κίτρινο"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "ροζ"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "μωβ"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "γκρί"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "καφέ"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "ουράνιο τόξο 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "ουράνιο τόξο 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "ουράνιο τόξο 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr "ουράνιο τόξο 3"
 msgid "???"
 msgstr ";;;"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Συζήτηση"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Ψιθυρίζοντας στο %s: %s"
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Εξοπλισμός"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Βοήθεια"
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1031,20 +1031,20 @@ msgstr ""
 msgid "Filter:"
 msgstr "Φίλτρο:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Χρήση"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr "Πέτα ..."
 msgid "Split"
 msgstr "Διαίρεση"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Ρούχα"
@@ -1064,7 +1064,7 @@ msgstr "Ρούχα"
 msgid "Weight:"
 msgstr "Βάρος:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr "Κατάστημα"
 msgid "Retrieve"
 msgstr "Ανάκτηση"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Πέτα"
 
@@ -1125,7 +1125,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr "Αποστολή"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Κλειδί: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Ξόρκια"
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2900,7 +2916,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index 973f65512..dacef46a7 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,14 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignoring incoming trade requests"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Accepting incoming trade requests"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -36,16 +44,16 @@ msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Setup"
 
@@ -320,43 +328,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Network Error"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignoring incoming trade requests"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Accepting incoming trade requests"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error while loading %s"
@@ -390,13 +390,13 @@ msgid "Name"
 msgstr "Name"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attack"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Talk"
 
@@ -450,7 +450,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Exit"
 
@@ -564,14 +564,14 @@ msgstr "Name:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -605,8 +605,8 @@ msgid "Female"
 msgstr "Female"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -684,64 +684,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -751,16 +751,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
@@ -933,25 +933,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Close"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -985,17 +985,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Equipment"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Unequip"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Help"
 
@@ -1019,7 +1019,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventory"
@@ -1032,20 +1032,20 @@ msgstr "Slots:"
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Use"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Split"
 msgstr "Split"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1065,7 +1065,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "Weight:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1075,9 +1075,9 @@ msgstr "Store"
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Drop"
 
@@ -1126,7 +1126,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1336,22 +1336,22 @@ msgstr "Send"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Failed to send as sender or letter invalid."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1560,7 +1560,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1887,103 +1887,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Colours"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Put all whispers in tabs"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2242,35 +2250,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2762,7 +2778,7 @@ msgstr "Request for Trade"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Skills"
 
@@ -2901,7 +2917,7 @@ msgstr "Create Guild"
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3009,7 +3025,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3390,7 +3406,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3566,83 +3582,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3666,447 +3682,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Emote Shortcut %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Item Shortcut %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Move Up"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Move Down"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Move Left"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Move Right"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Target & Attack"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Stop Attack"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Target NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Target Player"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Pick up"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Hide Windows"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Sit"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Allow/Disallow Trading"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Select OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Item Shortcut %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Help Window"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Status Window"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Inventory Window"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Equipment Window"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Skill Window"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Minimap Window"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Chat Window"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Item Shortcut Window"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Setup Window"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Emote Shortcut Window"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Smiley"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Emote Shortcut %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Toggle Chat"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Scroll Chat Up"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Scroll Chat Down"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Previous Chat Tab"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Next Chat Tab"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/eo.po b/po/eo.po
index ebc7731a9..18b647f1b 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr ""
 
@@ -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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1031,20 +1031,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2900,7 +2916,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/es.po b/po/es.po
index 9152e77ed..232a4efb1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/language/es/)\n"
@@ -23,13 +23,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorando las peticiones de intercambio"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Aceptando las peticiones de intercambio"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
 #: src/being.cpp:344
 msgid "Human"
-msgstr ""
+msgstr "Humano"
 
 #: src/being.cpp:561
 msgid "dodge"
@@ -40,16 +48,16 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Configuración"
 
@@ -327,43 +335,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorando las peticiones de intercambio"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Aceptando las peticiones de intercambio"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -397,13 +397,13 @@ msgid "Name"
 msgstr "Nombre"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Hablar"
 
@@ -457,7 +457,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Salir"
 
@@ -571,14 +571,14 @@ msgstr "Nombre:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -612,8 +612,8 @@ msgid "Female"
 msgstr "Femenino"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Otro"
 
@@ -691,64 +691,64 @@ msgstr "Nivel: %d"
 msgid "(empty)"
 msgstr "(vacío)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "predeterminado"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "negro"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "rojo"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "verde"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "azul"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "dorado"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "amarillo"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "rosa"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "púrpura"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "gris"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "marrón"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "arco iris 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "arco iris 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "arco iris 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -758,16 +758,16 @@ msgstr "arco iris 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
@@ -878,19 +878,19 @@ msgstr "Id de Objetivo:"
 
 #: src/gui/debugwindow.cpp:272
 msgid "Target level:"
-msgstr ""
+msgstr "Nivel del objetivo:"
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
 msgid "Target race:"
-msgstr ""
+msgstr "Raza del objetivo:"
 
 #: src/gui/debugwindow.cpp:274
 msgid "Target party:"
-msgstr ""
+msgstr "Grupo de objetivo:"
 
 #: src/gui/debugwindow.cpp:275
 msgid "Target guild:"
-msgstr ""
+msgstr "Gremio del objetivo:"
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
 #: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
@@ -940,25 +940,25 @@ msgstr "Recibiendo: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Enviando: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "¿Sabías que...?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Previo"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Siguiente >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Abrir automáticamente esta ventana"
 
@@ -993,17 +993,17 @@ 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."
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Equipamiento"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Quitárselo"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Ayuda"
 
@@ -1027,7 +1027,7 @@ msgstr "por cantidad"
 msgid "by type"
 msgstr "por tipo"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventario"
@@ -1040,20 +1040,20 @@ msgstr "Espacios:"
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1064,7 +1064,7 @@ msgstr "Tirar..."
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Conjuntos"
@@ -1073,7 +1073,7 @@ msgstr "Conjuntos"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1083,9 +1083,9 @@ msgstr "Almacenar"
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Tirar"
 
@@ -1134,7 +1134,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Estadísticas"
 
@@ -1249,7 +1249,7 @@ msgstr "Servidor:"
 #: src/gui/logindialog.cpp:129
 #, c-format
 msgid "Update host: %s"
-msgstr ""
+msgstr "Host de actualización: %s"
 
 #: src/gui/logindialog.cpp:145
 msgid "Custom update host"
@@ -1344,22 +1344,22 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Fallo al enviar o mensaje inválido."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Conjuntos: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Quitárselo antes"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Conjunto para modo AFK"
 
@@ -1562,13 +1562,13 @@ msgstr "Deformar"
 
 #: src/gui/popupmenu.cpp:595
 msgid "Move camera"
-msgstr ""
+msgstr "Mover cámara"
 
 #: src/gui/popupmenu.cpp:610
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Hechizos"
 
@@ -1817,7 +1817,7 @@ msgstr "requiere v%s"
 
 #: src/gui/setup_audio.cpp:45
 msgid "(no sound)"
-msgstr ""
+msgstr "(sin sonido)"
 
 #: src/gui/setup_audio.cpp:55
 msgid "Audio"
@@ -1825,7 +1825,7 @@ msgstr "Audio"
 
 #: src/gui/setup_audio.cpp:64
 msgid "Basic settings"
-msgstr ""
+msgstr "Configuraciones básicas"
 
 #: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
@@ -1853,39 +1853,39 @@ msgstr "Volumen de Música"
 
 #: src/gui/setup_audio.cpp:83
 msgid "Sound effects"
-msgstr ""
+msgstr "Efectos de sonido"
 
 #: src/gui/setup_audio.cpp:85
 msgid "Information dialog sound"
-msgstr ""
+msgstr "Sonido de diálogo de información"
 
 #: src/gui/setup_audio.cpp:88
 msgid "Request dialog sound"
-msgstr ""
+msgstr "Sonido de diálogo de petición"
 
 #: src/gui/setup_audio.cpp:91
 msgid "Whisper message sound"
-msgstr ""
+msgstr "Sonido de susurro"
 
 #: src/gui/setup_audio.cpp:94
 msgid "Guild / Party message sound"
-msgstr ""
+msgstr "Sonido de mensaje de Clan / Grupo"
 
 #: src/gui/setup_audio.cpp:97
 msgid "Highlight message sound"
-msgstr ""
+msgstr "Sonido de mensaje resaltado"
 
 #: src/gui/setup_audio.cpp:100
 msgid "Global message sound"
-msgstr ""
+msgstr "Sonido de mensaje global"
 
 #: src/gui/setup_audio.cpp:103
 msgid "Error message sound"
-msgstr ""
+msgstr "Sonido de mensaje de error"
 
 #: src/gui/setup_audio.cpp:106
 msgid "Trade request sound"
-msgstr ""
+msgstr "Sonido de petición de intercambio"
 
 #: src/gui/setup_audio.cpp:111
 msgid "Enable mumble voice chat"
@@ -1895,105 +1895,113 @@ msgstr "Habilitar el chat de voz de mumble"
 msgid "Download music"
 msgstr "Bajar Música"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Colores"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Remover los colores de los mensajes recibidos en el chat"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Mostrar lista de colores del chat"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 "Permitir utilizar los comandos de magia y GM en todo tipo de ventana de "
 "diálogo"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Límites"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Limitar máx. de caracteres en la línea de chat"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Limitar líneas máx. en chat"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Registros"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Habilitar registro de chat"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Mostrar historial del chat"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Mensajes"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Ocultar mensajes de la tienda"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Pestañas"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Mostrar nuevos susurros en pestañas"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Registrar mensajes de magia en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Habilitar pestaña de intercambio"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Habilitar pestaña de batalla"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalla"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Si hace falta, cambia el tamaño de pestañas del chat"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Usar hora local"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "Resaltar palabras (separadas por coma)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr "Mostrar mensajes MVP"
 
@@ -2078,7 +2086,7 @@ msgstr "Parar"
 
 #: src/gui/setup_joystick.cpp:124
 msgid "Rotate the stick and don't press buttons"
-msgstr ""
+msgstr "Girar la palanca y no presionar los botones"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2252,35 +2260,43 @@ msgstr "Habilitar soporte para auction bot"
 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:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "Habilitar el ataque del lado del servidor"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Habilitar el control de bot"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activar la protección de servidores con errores (no deshabilitar)"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite protector"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
-msgstr ""
+msgstr "Usar FBO para capturas de pantalla (sólo para opengl)"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Mostrar fondo"
 
@@ -2378,7 +2394,7 @@ msgstr "Permitir curarse a sí mismo con clic del ratón"
 
 #: src/gui/setup_players.cpp:86
 msgid "Group friends in who is online window"
-msgstr ""
+msgstr "Grupo de amigos en la ventana de conectados"
 
 #: src/gui/setup_relations.cpp:66
 msgid "Relation"
@@ -2651,23 +2667,23 @@ msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
 #: src/gui/setup_visual.cpp:35
 msgid "Visual"
-msgstr ""
+msgstr "Visual"
 
 #: src/gui/setup_visual.cpp:43
 msgid "Notifications"
-msgstr ""
+msgstr "Notificaciones"
 
 #: src/gui/setup_visual.cpp:45
 msgid "Show pickup notifications in chat"
-msgstr ""
+msgstr "Mostrar notificaciones en el chat al recoger"
 
 #: src/gui/setup_visual.cpp:48
 msgid "Show pickup notifications as particle effects"
-msgstr ""
+msgstr "Mostrar notificaciones como efecto de partículas al recoger"
 
 #: src/gui/setup_visual.cpp:51
 msgid "Effects"
-msgstr ""
+msgstr "Efectos"
 
 #: src/gui/setup_visual.cpp:53
 msgid "Grab mouse and keyboard input"
@@ -2731,15 +2747,15 @@ msgstr "Detalle de partículas"
 
 #: src/gui/setup_visual.cpp:88
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #: src/gui/setup_visual.cpp:94
 msgid "on"
-msgstr ""
+msgstr "on"
 
 #: src/gui/setup_visual.cpp:95
 msgid "Vsync"
-msgstr ""
+msgstr "Vsync"
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2775,7 +2791,7 @@ msgstr "Propuesta de intercambio"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -2914,7 +2930,7 @@ msgstr "Crear Clan"
 msgid "Create Party"
 msgstr "Crear grupo"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Social"
 
@@ -3022,7 +3038,7 @@ msgstr "Nombre del grupo"
 msgid "Choose your party's name."
 msgstr "Escoge el nombre del grupo."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Especiales"
 
@@ -3404,7 +3420,7 @@ msgstr "Quienes están conectados - "
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
@@ -3583,83 +3599,83 @@ msgstr "Comando: /unignore <jugador>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si está siendo ignorado."
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Control de robot"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Quién está conectado"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "KS"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Emotíconos"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "SKI"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "SH"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "SP"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "DR"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "¿Sabías que..."
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "SET"
 
@@ -3683,449 +3699,437 @@ msgstr "Almacenamiento"
 msgid "Cart"
 msgstr "Mochila"
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Atajo para Emoticono %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Atajo para el objeto %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
+"puede presentar un comportamiento raro."
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr "tecla_%d"
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr "tecla desconocida"
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr "tecla u"
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "Teclas Básicas"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Mover para arriba"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Mover para abajo"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Derecha"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Seleccionar & Atacar"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Mover al objetivo"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Cambiar Movimiento al tipo de Objetivo"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "Mover hacia la localización Inicial"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "Estableces la localización Inicial"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "Mover al punto de navegación"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Dejar de atacar"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr "Sin seleccionar"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Apuntar al más cercano"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Seleccionar NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Seleccionar Jugador"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Coger"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Cambiar el tipo de recogida"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Esconder ventanas"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Sentarse"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Imprimir pantalla"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Deshabilitar Intercambios"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Cambiar el tipo de vista del mapa"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Seleccionar OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "Teclas de Atajos"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "Tecla de acceso directo de objeto"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Atajo para el objeto %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "Teclas de Ventanas"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Ventana de ayuda"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Ventana de Estado"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Ventana de inventario"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Ventana de equipamiento"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Ventana de habilidades"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Ventana del Mini-mapa"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Ventana de Chat"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Ventana de atajos para objetos"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Ventana de Configuración"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Ventana de Depurador"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Ventana Social"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Ventana de Emoticonos"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Ventana de Conjuntos"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "Ventana de la tienda"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "Ventana de lanzamiento de objetos"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "Ventana de Estadísticas"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "Ventana de comandos"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "Ventana de Chequeo de Bot"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Ventana de Jugadores Conectados"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Ventana ¿Sabías que.."
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "Pestaña Social Previa"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "Pestaña Social Siguiente"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "Teclas de Emoticonos"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Emoticono"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Atajo para Emoticono %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "Teclas de Conjuntos"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Ponerse el conjunto"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Copiar el conjunto"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Copiar lo que tiene equipado a Conjunto"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "Teclas del Chat"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Cambiar Chat"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Desplazarse hacia arriba en el chat"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Desplazarse hacia abajo en el chat"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Pestaña de Chat Anterior"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Siguiente Pestaña del Chat"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Cerrar la Pestaña activa del Chat"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Línea previa del chat"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Siguiente línea del chat"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "Completar texto automáticamente en chat"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "Desactivar entrada al Chat"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "Otras Teclas"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "Arriba"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "Abajo"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "Derecha"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "Movimientos locos"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "Cambiar  el tipo de movimientos locos"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Lanzamiento de N objetos desde 0 casillas"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Dejar caer N artículos rápidamente"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr "Cambiar el contador de lanzamientos"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Curar rápidamente a objetivo o a sí mismo"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Usar el hechizo #itenplz"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Usar ataque mágico"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "Intercambiar ataque mágico"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr "Intercambiar ataque pvp"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "Cambiar tipo de maniobra"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "Cambiar tipo de arma de ataque"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "Cambiar tipo de ataque"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "Cambiar modo de perseguir"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "Cambiar modo de Imitación"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Deshabilitar las teclas de modificación del Juego"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "Encender / Apagar audio"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Deshabilitar modo AFK"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "Emular clic derecho desde el teclado"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "Interruptor de tipo de cámara"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "Tecla modificadora"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
-"puede presentar un comportamiento raro."
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
@@ -4391,7 +4395,7 @@ msgstr "(b) atacar a quienes están en malas relaciones"
 
 #: src/localplayer.cpp:2151
 msgid "(d) don't attack players"
-msgstr ""
+msgstr "(d) no atacar a los jugadores"
 
 #: src/localplayer.cpp:2152
 msgid "(?) pvp attack"
diff --git a/po/et.po b/po/et.po
index 782d27fbe..9046bf3db 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr ""
 
@@ -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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr "Naine"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Vestlus"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulge"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Abi"
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1031,20 +1031,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2900,7 +2916,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/fa.po b/po/fa.po
index 34dc28fa7..d36b8b65f 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -314,43 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "کلی"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "خطای شبکه"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,13 +384,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -444,7 +444,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "خروج"
 
@@ -558,14 +558,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -599,8 +599,8 @@ msgid "Female"
 msgstr "زن"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -678,64 +678,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -745,16 +745,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "چت"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -927,25 +927,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -979,17 +979,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "تجهیزات"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1026,20 +1026,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1050,7 +1050,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1059,7 +1059,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1069,9 +1069,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1120,7 +1120,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1328,22 +1328,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1552,7 +1552,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1879,103 +1879,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2234,35 +2242,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2754,7 +2770,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2893,7 +2909,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3001,7 +3017,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3382,7 +3398,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3558,83 +3574,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3658,447 +3674,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/fi.po b/po/fi.po
index 5785e6475..837508db7 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -19,6 +19,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Et huomioi kaupankäyntipyyntöjä"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Hyväksyt kaupankäyntipyynnöt"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
@@ -36,16 +44,16 @@ msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "-"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -324,43 +332,35 @@ msgstr ""
 "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
 "\"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Et huomioi kaupankäyntipyyntöjä"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Hyväksyt kaupankäyntipyynnöt"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -394,13 +394,13 @@ msgid "Name"
 msgstr "Nimi"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Hyökkää"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Keskustele"
 
@@ -454,7 +454,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Sulje"
 
@@ -568,14 +568,14 @@ msgstr "Nimi:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -609,8 +609,8 @@ msgid "Female"
 msgstr "Naispuolinen"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Muu"
 
@@ -688,64 +688,64 @@ msgstr "Taso %d"
 msgid "(empty)"
 msgstr "(tyhjä)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "oletus"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "musta"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "punainen"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "vihreä"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "sininen"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "kulta"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "keltainen"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "vaaleanpunainen"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "violetti"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "harmaa"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "ruskea"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "sateenkaari 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "sateenkaari 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "sateenkaari 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -755,16 +755,16 @@ msgstr "sateenkaari 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
@@ -937,25 +937,25 @@ msgstr "Sisään: %d tavua/s"
 msgid "Out: %d bytes/s"
 msgstr "Ulos: %d tavua/s"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "Tiesitkö?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulje"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Edellinen"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Seuraava >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Avaa tämä ikkuna automaattisesti"
 
@@ -989,17 +989,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Apua"
 
@@ -1023,7 +1023,7 @@ msgstr "määrä"
 msgid "by type"
 msgstr "tyyppi"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Tavarat"
@@ -1036,20 +1036,20 @@ msgstr "Paikkoja:"
 msgid "Filter:"
 msgstr "Suodin:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Käytä"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1060,7 +1060,7 @@ msgstr "Pudota..."
 msgid "Split"
 msgstr "Jaa"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
@@ -1069,7 +1069,7 @@ msgstr "Asukokonaisuudet"
 msgid "Weight:"
 msgstr "Paino:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1079,9 +1079,9 @@ msgstr "Varastoi"
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Pudota"
 
@@ -1130,7 +1130,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Paino: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Tappotilastot"
 
@@ -1340,22 +1340,22 @@ msgstr "Lähetä"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Asu: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Näppäin: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Riisu ensin"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Poissaoloasu"
 
@@ -1564,7 +1564,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr "Poista asu"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Loitsut"
 
@@ -1891,103 +1891,111 @@ msgstr "Ota muminaäänikeskustelu käyttöön"
 msgid "Download music"
 msgstr "Lataa musiikki"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Värit"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Poista värit saapuneista keskusteluviesteistä"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Näytä keskustelun värilista"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Komennot"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Salli magia ja GM-komennot kaikilla keskusteluvälilehdillä"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Rajat"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Keskusteluviestin pituusraja"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Keskusteluvälilehden riviraja"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Lokit"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Kirjaa keskustelut"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Näytä keskusteluhistoria"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Viestit"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Piilota kauppaviestit"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Välilehdet"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Laita kaikki kuiskaukset välilehtiin"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Kirjaa magiaviestit debug-välilehdelle"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Näytä palvelinviestit debug-välilehdellä"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Ota kaupankäyntivälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Ota taisteluvälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Näytä taistelutapahtumat"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Muuta välilehden kokoa tarpeen mukaan"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Aika"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Käytä paikallista aikaa"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "Korosta sanat (pilkuin erotettu)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr "Näytä MVP-viestit"
 
@@ -2246,35 +2254,43 @@ msgstr "Ota käyttöön huutokauppabotin tuki"
 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:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 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:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Piilota kilpihahmo"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Näytä tausta"
 
@@ -2768,7 +2784,7 @@ msgstr "Kaupantekoehdotus"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s haluaa %s %s - hyväksytkö?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Taidot"
 
@@ -2907,7 +2923,7 @@ msgstr "Luo kilta"
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Suhteet"
 
@@ -3015,7 +3031,7 @@ msgstr "Ryhmän nimi"
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Erikoisuudet"
 
@@ -3395,7 +3411,7 @@ msgstr "Kuka on linjoilla - "
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -3575,83 +3591,83 @@ msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Tämä komento huomioi pelaajan taas, jos tämä on ensin jätetty huomiotta."
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "BT"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Bottitutka"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "LIN"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Kuka on linjoilla"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "TT"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Hymiöt"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "Tie"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Hahmon tiedot"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "Var"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "Tav"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "Tai"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "Eri"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "Sos"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "PV"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "Lo"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "Pu"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "T?"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "Tiesitkö"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "Ase"
 
@@ -3675,449 +3691,437 @@ msgstr "Varasto"
 msgid "Cart"
 msgstr "Kärry"
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Eleen pikavalinta %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Tavarapikavalinta %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
+"ole hyvä ja poista päällekkäisyydet. "
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "Perusnäppäimet"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Ylöspäin"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Alaspäin"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Vasemmalle"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Oikealle"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Kohdista ja hyökkää"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Mene kohteen luo"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Muuta kohteen luo liikkumisen tyyppiä"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "Siirry kotipaikkaan"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "Aseta kotipaikka"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "Siirry reittipisteeseen"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Keskeytä hyökkäys"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr "Poista kohdevalinta"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Lähin kohteeksi"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "NPC kohteeksi"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Pelaaja kohteeksi"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Poimi"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Muuta poiminnan tyyppiä"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Piilota ikkunat"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Istu"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Kuvankaappaus"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Salli/estä kaupankäynti"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Vaihda karttanäkymää"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Valitse OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "Pikavalintanäppäimet"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "Tavaroiden pikavalintanäppäin"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Tavarapikavalinta %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "Ikkunanäppäimet"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Ohjeikkuna"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Tilaikkuna"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Tavaraikkuna"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Varusteikkuna"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Taitoikkuna"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Karttaikkuna"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Keskusteluikkuna"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Tavaroiden pikavalintaikkuna"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Asetusikkuna"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Debug-ikkuna"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Suhdeikkuna"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Eleiden pikavalintaikkuna"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Asukokonaisuusikkuna"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "Kauppaikkuna"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "Pikapudotusikkuna"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "Tappotilastoikkuna"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "Komentoikkuna"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "Bottitutkaikkuna"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Kuka on linjoilla -ikkuna"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Tiesitkö-ikkuna"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "Edellinen sos. välilehti"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "Seuraava sos. välilehti"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "Elenäppäimet"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Hymiö"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Eleen pikavalinta %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "Asunäppäimet"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Pue asu"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Kopioi asu"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Kopioi varusteet asuksi"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "Keskustelunäppäimet"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Ota keskustelu käyttöön/pois käytöstä"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Vieritä keskustelua ylös"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Vieritä keskustelua alas"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Edellinen keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Seuraava keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Sulje tämä keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Edellinen keskustelulinja"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Seuraava keskustelulinja"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "Sarkaintäydennys keskustelussa"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "Poistu keskustelusyötöstä"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "Muut näppäimet"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Jätä huomiotta syöte 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Jätä huomiotta syöte 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "Vie ylös"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "Vie alas"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "Vie vasemmalle"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "Vie oikealle"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "Villiliikkeet"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "Muuta villiliiketilaa"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Pudota nopeasti N esinettä paikasta 0"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Pudota nopeasti N esinettä"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr "Vaihda nopean pudotuksen laskuria"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Pikaparanna kohde tai itse"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Käytä #itenplz-loitsua"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Käytä magiahyökkäystä"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "Vaihda magiahyökkäystä"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr "Vaihda PvP-hyökkäystä"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "Vaihda liikkumistyyppiä"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "Vaihda hyökkäysaseen tyyppiä"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "Vaihda hyökkäystyyppiä"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "Vaihda seuraustyyliä"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "Vaihda matkintatyyliä"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr "Ota käyttöön / poista pelimuokkaimet"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "Äänet päälle / pois"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Aseta / peru poissaolo"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "Kontekstivalikkoon \"klikkaus\" näppäimistöltä"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "Vaihda kameran toimintaa"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "Muokkausnäppäin"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
-"ole hyvä ja poista päällekkäisyydet. "
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/fr.po b/po/fr.po
index b563078af..eaabd6376 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/"
 "fr/)\n"
@@ -24,6 +24,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorer les requêtes d'échanges entrantes"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Accepter les requêtes d'échanges entrantes"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Visible sur la carte"
@@ -41,16 +49,16 @@ msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Configuration"
 
@@ -330,44 +338,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 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:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorer les requêtes d'échanges entrantes"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Accepter les requêtes d'échanges entrantes"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -401,13 +401,13 @@ msgid "Name"
 msgstr "Nom"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attaquer"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Parler"
 
@@ -461,7 +461,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Quitter"
 
@@ -575,14 +575,14 @@ msgstr "Nom :"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -616,8 +616,8 @@ msgid "Female"
 msgstr "Féminin"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Autre"
 
@@ -695,64 +695,64 @@ msgstr "Niveau %d"
 msgid "(empty)"
 msgstr "(vide)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "défaut"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "noir"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "rouge"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "vert"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "bleu"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "or"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "jaune"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "rose"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "violet"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "gris"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "marron"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "arc en ciel 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "arc en ciel 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "arc en ciel 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -762,16 +762,16 @@ msgstr "arc en ciel 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message envoyé à %s : %s"
@@ -944,25 +944,25 @@ msgstr "Entrée : %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Sortie : %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "Le saviez-vous ?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Précédent"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Suivant >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Ouverture automatique de cette fenêtre"
 
@@ -996,17 +996,17 @@ msgstr "Description :"
 msgid "Please at least type both the address and the port of the server."
 msgstr "S'il vous plait, entrez l'adresse et le port du serveur."
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Retirer"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Aide"
 
@@ -1030,7 +1030,7 @@ msgstr "par nombre"
 msgid "by type"
 msgstr "par type"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventaire"
@@ -1043,20 +1043,20 @@ msgstr "Emplacements :"
 msgid "Filter:"
 msgstr "Filtre :"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1067,7 +1067,7 @@ msgstr "Jeter..."
 msgid "Split"
 msgstr "Partager"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Tenues"
@@ -1076,7 +1076,7 @@ msgstr "Tenues"
 msgid "Weight:"
 msgstr "Poids :"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1086,9 +1086,9 @@ msgstr "Entreposer"
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Jeter"
 
@@ -1137,7 +1137,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Poids : %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Statistiques"
 
@@ -1347,22 +1347,22 @@ msgstr "Envoyer"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Échec de l'envoi comme émetteur ou caractère invalide."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Tenue : %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Touche : %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Retirer d'abord l'équipement"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Équipement en absence"
 
@@ -1571,7 +1571,7 @@ msgstr "Bouger la caméra"
 msgid "Clear outfit"
 msgstr "Effacer la tenue"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Sortilèges"
 
@@ -1898,103 +1898,111 @@ msgstr "Activer le chat avec mumble"
 msgid "Download music"
 msgstr "Télécharger la musique"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Retirer les couleurs des messages de chat"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Montrer la liste des couleurs de chat"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Commandes"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Messages de magie et commandes GM dans tous les onglets du chat"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Limites"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Limiter le nbre max de car d'une ligne de discussion"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Limiter le nbre max de lignes dans le chat"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Enregistrements"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Activer l'enregistrement des conversations"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Afficher l'historique de discussion"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Messages"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Masquer les messages liés à la boutique"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Fenêtre"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Placer tous les messages privés dans des onglets"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Messages de magie dans l'onglet \"informations\""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Afficher les messages du serveur dans l'onglet \"informations\""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Activer la boite de dialogue d'échanges"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Activer l'onglet de combat"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Afficher les événements de combat"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Si besoin est, changer la taille des fenêtre de dialogue"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Temps"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Utiliser l’horaire local"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "Mots en surbrillance (séparés par une virgule)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr "Montrer les messages MVP"
 
@@ -2254,35 +2262,43 @@ 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:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Active la protection pour serveurs defaillant (ne pas désactiver)"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Activer l'enregistrement des informations"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Cacher le bouclier"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utiliser FBO pour les captures d'écran (seulement pour OpenGL)"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Montrer le fond"
 
@@ -2784,7 +2800,7 @@ msgstr "Demande d'échange"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s souhaite %s %s Acceptez-vous ?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Compétences"
 
@@ -2923,7 +2939,7 @@ msgstr "Créer une Guilde"
 msgid "Create Party"
 msgstr "Créer un groupe"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Social"
 
@@ -3035,7 +3051,7 @@ msgstr "Nom du groupe"
 msgid "Choose your party's name."
 msgstr "Choisissez le nom du groupe."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Cpt. spéciales"
 
@@ -3417,7 +3433,7 @@ msgstr "Qui est en ligne - "
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3600,83 +3616,83 @@ msgstr "Commande : /unignore <joueur>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "TdR"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Testeur de robot"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "OnL"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Qui est en ligne"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "Sta"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Émoticône"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Statut"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "Equ"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "Inv"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "Cmp"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "Spe"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "Soc"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "Rac"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "Sor"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "Jet"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "Le savez-vous ?"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "Cfg"
 
@@ -3700,449 +3716,437 @@ msgstr "Entrepôt"
 msgid "Cart"
 msgstr "Panier"
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Raccourci d'émoticône %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Raccourci Objet %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
+"touches ou attendez vous à un possible comportement étrange du jeu."
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "Touches de base"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Monter"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Descendre"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Aller à gauche"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Aller à droite"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Viser et Attaquer"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Aller à la cible"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Changer le type de déplacement vers les cibles"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "Aller à l'emplacement de base"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "Définir l'emplacement de base"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "Aller jusqu'au point de navigation"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Arrêter d'attaquer"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr "Désélectionner"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Viser le monstre le plus proche"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Sélectionner le PNJ"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Viser le Joueur"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Ramasser"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Changer le type de ramassage"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Cacher les fenêtres"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "S'asseoir"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Activer/Désactiver les échanges"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Changer le mode de vision de carte"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Sélectionner OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "Touches raccourcis"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "Touche de raccourcis items"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Raccourci Objet %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "Touches des fenêtres"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Fenêtre d'Aide"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Fenêtre d'état"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Fenêtre de l'inventaire"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Fenêtre d'équipements."
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Fenêtre de compétences"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Fenêtre de Mini-carte"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Fenêtre de conversation"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Fenêtre de raccourci objet"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Fenêtre de configuration"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Fenêtre d'informations"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Groupes et Guildes"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Fenêtre de raccourcis d’émoticônes"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Fenêtre des tenues"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "Fenêtre du magasin"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "Fenêtre pour jeter les items"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "Fenêtre de statistiques"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "Fenêtre de commandes"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "Fenêtre du testeur de robot"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Fenêtre - Qui est en ligne ?"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Connaissiez-vous la fenêtre ?"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "Onglet de dialogue précédent"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "Onglet de dialogue suivant"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "Touches d'émoticones"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Smileys"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Raccourci d'émoticône %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "Touches des tenues"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Mettre la tenue"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Copier la tenue"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Copier l'équipement porté dans les tenues"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "Touches de la boite de dialogue"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Activer / Désactiver la conversation"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Défiler la conversation (haut)"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Défiler la conversation (bas)"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Onglet de conversation précédent"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Onglet de conversation suivant"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Fermer l'onglet de dialogue courant"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Ligne de conversation précédente"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Ligne de conversation suivante"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "Auto complétion du chat"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "Désactiver la saisie dans le chat"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "Autres touches"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignorer l'entrée 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "Vers le haut"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "Vers le bas"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "Vers la gauche"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "Vers la droite"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "Mouvements de fous"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "Changer le mode de mouvement de fou"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Jeter rapidement N objets depuis l'emplacement 0"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Jeter rapidement N objets"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr "Changer de compteur de jet rapide d'objets"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Soins rapides de la cible ou de soi"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Utiliser le sort #itenplz"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Utiliser l'attaque magique"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "Changer d'attaque magique"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr "Commutateur d'attaque en PVP"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "Changer de type de mouvement"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "Changer de type d'arme d'attaque"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "Changer de type d'attaque"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "Changer de type de suivi"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "Changer de type d'imitation"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr "Désactiver / Activer les touches de modifications du jeu"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "Son On / Off"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Activer / Désactiver le mode en absence"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "Emuler le clic droit à partir du clavier"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "Changer le mode caméra"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "Modifier la touche"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
-"touches ou attendez vous à un possible comportement étrange du jeu."
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/he.po b/po/he.po
index 8806c3c39..382411285 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "מתעלם מהצעות סחר נכנסות"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "מאשר הצעות סחר נכנסות"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "הגדרות"
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "האפשרויות עבור /%s הינם \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "כללי"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "מתעלם מהצעות סחר נכנסות"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "מאשר הצעות סחר נכנסות"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "שגיאה בעת טעינת %s"
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr "שם"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "תקוף"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "דבר"
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "יציאה"
 
@@ -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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr "נקבה"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "שיחה"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "סגור"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "לבוש"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "הורד"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "עזרה"
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "ציוד"
@@ -1031,20 +1031,20 @@ msgstr "בשימוש:"
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr "פצל"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "משקל:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr "אחסן"
 msgid "Retrieve"
 msgstr "החזר"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "השלך"
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr "שלח"
 msgid "Failed to send as sender or letter invalid."
 msgstr "נכשלה השליחה מכיוון והשולח או המכתב בעלי שגיאה."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "צבעים"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "הכנס את כל הלחישות ללשוניות"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr "בקשה למסחר"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "כישורים"
 
@@ -2900,7 +2916,7 @@ msgstr "צור גילדה"
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "מצב"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "קיצור־דרך לריגשון %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "קיצור־דרך לחפץ %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "הזז למעלה"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "הזז למטה"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "הזז שמאלה"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "הזז ימינה"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "כוון ותקוף"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "הפסק לתקוף"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "כוון לדמות"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "כוון לשחקן"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "הרם"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "הסתר חלונות"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "שב"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "תמונת־מסך"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "אפשר/בטל מסחר"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "בחר אישור"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "קיצור־דרך לחפץ %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "חלון עזרה"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "חלון מצב"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "חלון ציוד"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "חלון לבוש"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "חלון כישורים"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "חלון מיני מפה"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "חלון שיחה"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "חלון קיצור־דרך לחפץ"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "חלון הגדרות"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "חלון ניפוי"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "חלון קיצור־דרך לרגישון"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "חייך"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "קיצור־דרך לריגשון %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "סגירת הצ'אט"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "גלול שיחה למעלה"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "גלול שיחה למטה"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "לשונית השיחה הקודמת"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "לשונית השיחה הבאה"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "קלט התעלמות 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "קלט התעלמות 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/hr.po b/po/hr.po
index fdb1496ea..6e513a3be 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Podešavanje"
 
@@ -324,43 +332,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Općenito"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
@@ -394,13 +394,13 @@ msgid "Name"
 msgstr "Ime"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Napad"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Govori"
 
@@ -454,7 +454,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Izlaz"
 
@@ -568,14 +568,14 @@ msgstr "Ime:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -609,8 +609,8 @@ msgid "Female"
 msgstr "Žensko"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -688,64 +688,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -755,16 +755,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -937,25 +937,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -989,17 +989,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Skini opremu"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Pomoć"
 
@@ -1023,7 +1023,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Zalihe"
@@ -1036,20 +1036,20 @@ msgstr "Mjesta:"
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Upotrijebi"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1060,7 +1060,7 @@ msgstr ""
 msgid "Split"
 msgstr "Razdvoji"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1069,7 +1069,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "Težina:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1079,9 +1079,9 @@ msgstr "Pohrani"
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Ispusti"
 
@@ -1130,7 +1130,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1342,22 +1342,22 @@ 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:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1566,7 +1566,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1893,103 +1893,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Boje"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Stavi sve šapate u kartice"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2248,35 +2256,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2768,7 +2784,7 @@ msgstr "Zahtjev za Trgovanje"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Vještine"
 
@@ -2907,7 +2923,7 @@ msgstr "Formiraj Ceh"
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3015,7 +3031,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3396,7 +3412,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3572,83 +3588,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3672,447 +3688,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Prečica za Ispoljavanje emocija %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Prečac do Predmeta %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Pomakni Gore"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Pomakni Dolje"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Pomakni Ulijevo"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Pomakni Udesno"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Meta i Napad"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Prekini Napad"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Ciljaj NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Ciljaj Igrača"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Pokupi"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Skrij Prozore"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Sjedni"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Snimak zaslona"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Omogući/Onemogući Trgovanje"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Odaberite OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Prečac do Predmeta %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Prozor za Pomoć"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Prozor Statusa"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Prozor Inventara"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Prozor Opreme"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Prozor Vještine"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Prozor Minikarte"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Chat Prozor"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Prozor za Prečice do Predmeta"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Prozor za Postavke"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Debug Prozor"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Prozor Prečica za Ispoljavanje emocija"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Smajlić"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Prečica za Ispoljavanje emocija %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Pomakni Chat Gore"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Pomakni Chat Dolje"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Prethodna Chat Kartica"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/hu.po b/po/hu.po
index 9c970a604..e54c888a1 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Kereskedési kérelmek elutasítása"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Kereskedési kérelmek elfogadása"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Beállítások"
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Általános"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Kereskedési kérelmek elutasítása"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Kereskedési kérelmek elfogadása"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr "Név"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Támadás"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Csevegés"
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -563,14 +563,14 @@ msgstr "Név:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr "Nő"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Bezár"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Felszerelés"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Nem használ"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Súgó"
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Táska"
@@ -1031,20 +1031,20 @@ msgstr "Hely:"
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Használ"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Bevet"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr "Felosztás"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "Súly:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr "Raktároz"
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Eldob"
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ 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:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Színek"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Privátok fülekbe tétele"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr "Üzleti ajánlat"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Képességek"
 
@@ -2900,7 +2916,7 @@ msgstr "Klán létrehozása"
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Státusz"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Hangulatjel Gyorsmenü %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Gyorsmenü %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Mozgás felfelé"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Mozgás lefelé"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Mozgás balra"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Mozgás jobbra"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Kijelöl és Támad"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Támadás Megszüntetése"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Gépjátékost Kijelöl"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Játékost Kijelöl"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Felvesz"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Ablakok Elrejtése"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Ülés"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Képernyőkép"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Ok Kiválasztása"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Gyorsmenü %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Súgó Ablak"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Sztátusz Ablak"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Táska Ablak"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Felszerelés Ablak"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Képességek Ablak"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Minitérkép Ablak"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Chat Ablak"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Gyorsmenü Ablak"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Beállítások Ablak"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Hibakereső Ablak"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Hangulatjel Gyorsmenü Ablak"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Hangulatjel"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Hangulatjel Gyorsmenü %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Chat Ki/Be Kapcsolása"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Csevej Felfele Görgetése"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Csevej Lefele Görgetése"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Előző Chat Fül"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Következő Chat Fül"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/id.po b/po/id.po
index 143a7638d..f7bd2ab1a 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/"
 "language/id/)\n"
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Abaikan permohonan transaksi"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Terima permohonan transaksi"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Terlihat di peta"
@@ -38,16 +46,16 @@ msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Pengaturan"
 
@@ -320,43 +328,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Umum"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Abaikan permohonan transaksi"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Terima permohonan transaksi"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -390,13 +390,13 @@ msgid "Name"
 msgstr "Nama"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Pukul"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Berbicara"
 
@@ -450,7 +450,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Keluar"
 
@@ -564,14 +564,14 @@ msgstr "Nama:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -605,8 +605,8 @@ msgid "Female"
 msgstr "Perempuan"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Lainnya"
 
@@ -684,64 +684,64 @@ msgstr "Level %d"
 msgid "(empty)"
 msgstr "(kosong)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "kembalikan ke semula"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "hitam"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "merah"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "hijau"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "biru"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "emas"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "kuning"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "merah muda"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "ungu"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "abu-abu"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "coklat"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "pelangi 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "pelangi 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "pelangi 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -751,16 +751,16 @@ msgstr "pelangi 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Obrolan"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
@@ -933,25 +933,25 @@ msgstr "Masuk: %d bytes/det"
 msgid "Out: %d bytes/s"
 msgstr "Keluar: %d bytes/det"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "Apakah kamu tahu?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tutup"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "Sebelumnya"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Selanjutnya"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Buka jendela otomatis"
 
@@ -985,17 +985,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Lepaskan"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Bantuan"
 
@@ -1019,7 +1019,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Perbekalan"
@@ -1032,20 +1032,20 @@ msgstr "Slot"
 msgid "Filter:"
 msgstr "Penyaring:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Pakai"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Gunakan"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1056,7 +1056,7 @@ msgstr "Buang..."
 msgid "Split"
 msgstr "Pecah"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Setelan"
@@ -1065,7 +1065,7 @@ msgstr "Setelan"
 msgid "Weight:"
 msgstr "Berat"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1075,9 +1075,9 @@ msgstr "Simpan"
 msgid "Retrieve"
 msgstr "Kembalikan"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Buang"
 
@@ -1126,7 +1126,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Berat: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Stat membunuh"
 
@@ -1334,22 +1334,22 @@ msgstr "Kirim"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Gagal untuk mengirim sebagai pengirim atau surat tidak valid."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Setelan: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Kunci: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Copot lebih dahulu"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Setelan saat bepergian"
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Mantra"
 
@@ -1885,103 +1885,111 @@ msgstr "Perbolehkan gumaman obrolan suara"
 msgid "Download music"
 msgstr "Unduh musik"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Warna"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Hapus warna dari pesan obrolan yang masuk"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Tunjukkan daftar warna obrolan"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Perintah"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Perbolehkan sihir dan Perintah GM di semua jendela obrolan"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Batas"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Batas maksimal karakter di garis obrolan"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Batas maksimal baris di obrolan"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Daftar"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Perbolehkan riwayat obrolan"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Tunjukkan riwayat obrolan"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Pesan"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Sembunyikan pesan Jual"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Tab"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Masukkan semua bisikan kedalam tab"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Riwayat pesan sihir di jendela debug"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Tujukkan pesan server di jendela debug"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Perbolehkan jendela transkaksi/trade"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Perbolehkan jendela pertarungan"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Tunjukkan event pertarungan"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Atur besar jendela obrolan apabila dibutuhkan"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Waktu"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Pengunaan waktu lokal"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2240,35 +2248,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
@@ -2760,7 +2776,7 @@ msgstr "Meminta untuk menukar"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s ingin %s %s apakah anda bersedia?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -2899,7 +2915,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3007,7 +3023,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3387,7 +3403,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3562,83 +3578,83 @@ msgstr "perintah: /unignore <nama pemain>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Emotikon"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "Apakah kamu tahu"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3662,447 +3678,435 @@ msgstr "Tempat penyimpanan"
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "Jendela stat membunuh"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Apakah kamu mengetahui jendela"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Salin barang-barang yang dipakai ke Setelan"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Tutup tab obrolan ini"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Garis obrolan sebelumnya"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Garis obrolan selanjutnya"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "Kunci pengubah"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/it.po b/po/it.po
index 7ee454c72..8cdca83b3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,14 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Le richieste di scambio in arrivo saranno ignorate"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Le richieste di scambio in arrivo saranno accettate"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -38,16 +46,16 @@ msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Impostazioni"
 
@@ -322,43 +330,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" (falso), \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Generale"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Screenshot salvato come"
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Le richieste di scambio in arrivo saranno ignorate"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Le richieste di scambio in arrivo saranno accettate"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa."
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
@@ -392,13 +392,13 @@ msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attacco"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Parla"
 
@@ -452,7 +452,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Esci"
 
@@ -566,14 +566,14 @@ msgstr "Nome:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -607,8 +607,8 @@ msgid "Female"
 msgstr "Femmina"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -686,64 +686,64 @@ msgstr "Livello %d"
 msgid "(empty)"
 msgstr "(vuoto)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "Predefinito"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "Nero"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "Rosso"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "Verde"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "Blu"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "Oro"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "Giallo"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "Rosa"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "Viola"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "Grigio"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "Marrone"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "Arcobaleno 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "Arcobaleno 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "Arcobaleno 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -753,16 +753,16 @@ msgstr "Arcobaleno 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -935,25 +935,25 @@ msgstr "In: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Out: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -987,17 +987,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Togli"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Aiuto"
 
@@ -1021,7 +1021,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventario"
@@ -1034,20 +1034,20 @@ msgstr "Slot:"
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Usa"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1058,7 +1058,7 @@ msgstr "Lascia..."
 msgid "Split"
 msgstr "Dividi"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Attrezzatura"
@@ -1067,7 +1067,7 @@ msgstr "Attrezzatura"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1077,9 +1077,9 @@ msgstr "Magazzino"
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Lascia"
 
@@ -1128,7 +1128,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Statistiche uccisioni"
 
@@ -1338,22 +1338,22 @@ msgstr "Invia"
 msgid "Failed to send as sender or letter invalid."
 msgstr "La lettera non è valida oppure non è stato possibile inviarla."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Outfit: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Chiave: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Rimuovi prima"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Away outfit"
 
@@ -1562,7 +1562,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Spells"
 
@@ -1889,103 +1889,111 @@ msgstr "Abilita chat vocale mumble"
 msgid "Download music"
 msgstr "Scarica musica"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Colori"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Rimuovi colori dei messaggi ricevuti in chat"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Mostra colori per la chat"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Autorizza i comandi delle magie e dei GM per tutte le tabelle di chat"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Limita un massimo di caratteri per messaggio"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Limita un massimo di messaggi per la chat"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Abilita I logs della chat"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Mostra la storia della chat"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Nascondi i messaggi del negozio"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Sposta tutti i sussurri in schede"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Salva i messaggi delle magie nella debug tab"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Mostra i messaggi del server nella chat di debug"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Abilita la chat di commercio"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Abilita la chat di battaglia"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Mostra gli eventi della battaglia"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2244,35 +2252,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Abilita il bot checker"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Abilita i log di debug"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Modalità basso traffico"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Nascondi lo scudo"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Mostra sfondo"
 
@@ -2764,7 +2780,7 @@ msgstr "Richiesta di commercio"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vuole %s %s accetti?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Abilità"
 
@@ -2903,7 +2919,7 @@ msgstr "Crea una Gilda"
 msgid "Create Party"
 msgstr "Crea gruppo"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Sociale"
 
@@ -3011,7 +3027,7 @@ msgstr "Nome del gruppo"
 msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party"
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Speciali"
 
@@ -3392,7 +3408,7 @@ msgstr "Chi è online -   "
 msgid "Who Is Online - error"
 msgstr "Chi è online - errore"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Chi è online - aggiornamento"
 
@@ -3568,83 +3584,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr "Questo comando smette di ignorare l'altro giocatore se è stato ignorato in precedenza"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Bot checker"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Chi è online"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "KS"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Stato"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "SKI"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "SH"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "SP"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "DR"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "SET"
 
@@ -3668,447 +3684,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Scorciatoia %d"
+
+#: src/keyboardconfig.cpp:138
+#, 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"
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Muoviti verso l'alto"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Muoviti verso il basso"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Muoviti verso sinistra"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Muoviti verso destra"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Mirino e attacco"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Muovi all'obbiettivo"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Ferma attacco"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Seleziona il più vicino"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Punta NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Punta Giocatore"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Raccogli"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Cambia modo di raccogliere"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Nascondi la Finestra"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Siediti"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Abilita/Disabilita Scambi"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Cambia visualiz. mappa"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Seleziona OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Scorciatoia %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Finestra di Aiuto"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Finestra degli Status"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Finestra dell'Inventario"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Finestra dell'Equipaggiamento"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Finestra delle Capacità"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Finestra Minimappa"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Finestra della Chat"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Finestra Scorciatoia Oggetti"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Finestra del Setup"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Finestra di debug"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Attiva Chat"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Scorre la chat in alto"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Scorre la chat in basso"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Scheda Chat Precedente"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Scheda Chat Successiva"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignora input 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignora input 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "On / Off audio"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Abilita / Disabilita modalità away"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, 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"
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/ja.po b/po/ja.po
index 8ebfa423d..a96270dc0 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/"
 "language/ja/)\n"
@@ -23,6 +23,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "トレードリクエストを無効にしています"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "トレードリクエストを有効にしました"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "マップに表示させる"
@@ -40,16 +48,16 @@ msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "設定"
 
@@ -322,43 +330,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr " としてスクリーンショットを保存しました"
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました"
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "トレードリクエストを無効にしています"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "トレードリクエストを有効にしました"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "マップの読み込みに失敗しました"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sの読み込み中にエラーが起きました"
@@ -392,13 +392,13 @@ msgid "Name"
 msgstr "名前"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻撃"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "話す"
 
@@ -452,7 +452,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "終了"
 
@@ -566,14 +566,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -607,8 +607,8 @@ msgid "Female"
 msgstr "女性"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "その他"
 
@@ -686,64 +686,64 @@ msgstr "レベル%d"
 msgid "(empty)"
 msgstr "(空)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "デフォルト"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "黒"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "赤"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "緑"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "青"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "金色"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "黄色"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "ピンク"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "紫"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "グレー"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "茶色"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "カラフル1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "カラフル 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "カラフル 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -753,16 +753,16 @@ msgstr "カラフル 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "チャット"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます"
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
@@ -935,25 +935,25 @@ msgstr "入力: %dバイト/秒"
 msgid "Out: %d bytes/s"
 msgstr "出力: %d バイト/秒"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "豆知識"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "閉じる"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< 前へ"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "次へ >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "この窓を自動で開ける"
 
@@ -987,17 +987,17 @@ msgstr "詳細:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "サーバーアドレスとポートを入力して下さい"
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "装着品"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "取外す"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -1021,7 +1021,7 @@ msgstr "数量"
 msgid "by type"
 msgstr "タイプ"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "インベントリー"
@@ -1034,20 +1034,20 @@ msgstr "スロット:"
 msgid "Filter:"
 msgstr "フィルタ:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "装着"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1058,7 +1058,7 @@ msgstr "落とす..."
 msgid "Split"
 msgstr "分割"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "服装"
@@ -1067,7 +1067,7 @@ msgstr "服装"
 msgid "Weight:"
 msgstr "重量:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1077,9 +1077,9 @@ msgstr "保管"
 msgid "Retrieve"
 msgstr "取出す"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "落とす"
 
@@ -1128,7 +1128,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "重力: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "キル統計"
 
@@ -1336,22 +1336,22 @@ msgstr "送信する"
 msgid "Failed to send as sender or letter invalid."
 msgstr "文字か差出人が無効の為送信に失敗しました"
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "服装: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "鍵: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "最初に取外す"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "AFK中の服装"
 
@@ -1560,7 +1560,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "呪文"
 
@@ -1887,103 +1887,111 @@ msgstr "Mumble Voice Chatを有効にする"
 msgid "Download music"
 msgstr "音楽をダウンロードする"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "色"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "受信したメッセージの色を無効にする"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "チャットの文字色リストを表示"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "コマンド"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "全てのタブで呪文とGMコマンドをログする"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "制限"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "チャットで一行に表示する最大文字数を制限する"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "チャットで表示する最大行数を制限する"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "ログ"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "チャットログを有効"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "チャット履歴を表示"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "メッセージ"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "売買メッセージを隠す"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "タブ"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "ささやきををタブで表示する"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "デバッグタブに呪文をログする"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "デバッグタブにサーバーメッセージをログする"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "トレードタブを有効"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "バトルタブを有効"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "バトルイベントを表示"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "チャットタブをリサイズする"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "時間"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "ローカルタイムを使う"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "文字をハイライト (コンマで区切る)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr "MVPメッセージを表示する"
 
@@ -2242,35 +2250,43 @@ msgstr "オークションボットのサポート"
 msgid "Enable guild bot support and disable native guild support"
 msgstr "ギルドサポートを無効にしギルドボットを有効にする"
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "サーバーサイドアタックを有効にする"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "ボットチェッカーを有効にする"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "不安定なサーバー保護を有効にする(無効にしない)"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "デバッグログを有効にする"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "低トラフィックモード"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "シールドスプライトを隠す"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "背景を表示する"
 
@@ -2765,7 +2781,7 @@ msgstr "トレードをリクエスト"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか？"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "スキル"
 
@@ -2904,7 +2920,7 @@ msgstr "ギルドを作成する"
 msgid "Create Party"
 msgstr "パーティを作る"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "ソーシャル"
 
@@ -3012,7 +3028,7 @@ msgstr "パーティ名"
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください"
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "スペシャル"
 
@@ -3394,7 +3410,7 @@ msgstr "オンラインリスト - "
 msgid "Who Is Online - error"
 msgstr "オンラインリスト - エラー"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
@@ -3573,83 +3589,83 @@ msgstr "コマンド: /unignore <プレイヤー名>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "このコマンドはプレイヤー完全無視を解除します"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "ボットチェッカー"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "オンラインリスト"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "KS"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "スマイリー"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "ステータス"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "SKI"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "SH"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "SP"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "DR"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "豆知識"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "SET"
 
@@ -3673,449 +3689,437 @@ msgstr "倉庫"
 msgid "Cart"
 msgstr "カート"
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "スマイリーショートカット: %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "アイテムショートカット: %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
+"ん"
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "標準キー"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "上へ移動"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "下へ移動"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "左へ移動"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "右へ移動"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "ターゲット&攻撃"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "ターゲットまで移動"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "ターゲットへ接近方法変更"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "ホーム位置まで移動"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "ホーム位置変更"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "ナビゲーションポイントへ移動"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "攻撃を止める"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr "ターゲットから外す"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "最も近いを目標にする"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "NPCを狙う"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "プレイヤーをターゲット"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "拾う"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "拾い方を変更"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "ウィンドウを隠す"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "座る"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "取引を有効/無効にする"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "マップビューモード変更"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "OKを選択する"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "ショートカットキー"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "アイテムショートカットキー"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "アイテムショートカット: %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "ウィンドウズキー"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "ヘルプウィンドウ"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "ステータスウィンドウ"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "インベントリーウィンドウ"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "装着ウィンドウ"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "スキルウィンドウ"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "ミニマップウィンドウ"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "チャットウィンドウ"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "アイテムショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "設定ウィンドウ"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "デバグウィンドウ"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "ソーシャルウインドウ"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "スマイリーショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "服装ウインドウ"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "ショップウィンドウ"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "クイックドロップウィンドウ"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "キルスタッツ窓"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "コマンドウインドウ"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "ボットチェッカーウィンドウ"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "オンラインユーザーウインドウ"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "豆知識窓"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "前ソーシャルタブ"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "次ソーシャルタブ"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "スマイリーキー"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "スマイリー"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "スマイリーショートカット: %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "服装キー"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "服を着る"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "服をコピーする"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "装着品を服装にコピー"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "チャットキー"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "トグルチャット"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "チャットを上へスクロールする"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "チャットを下へスクロールする"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "前のチャットタブ"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "次のチャットタブ"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "このチャットタブを閉じる"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "前チャット文"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "次チャット文"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "チャットオートコンプリート"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "チャット入力無効"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "その他のキー"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "インプット１完全無視"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "インプット２完全無視"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "上方向"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "下方向"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "左方向"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "右方向"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "クレイジームーブ"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "クレイジームーブモード変更"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Nアイテムを 0スロットからクイックドロップ"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Nアイテムをクイックドロップ"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr "クイックドロップカウンター変更"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "ターゲット又は自分をHP回復させる"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "呪文 #itenplz を唱える"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "魔法攻撃を使用"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "マジックアタック変更"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr "PvP攻撃変更"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "ムーブタイプ変更"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "武器変更"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "攻撃方法変更"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "フォローモード変更"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "真似モード変更"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr "ゲームモディファイアキーを無効 / 有効にする"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "オーディオ　オン/オフ"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "AFKモードを有効 / 無効にする"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "右クリックをエミュレートする"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "カメラモード変更"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "モディファイアキー"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
-"ん"
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/ka.po b/po/ka.po
index e8a6ef007..83ea5f4f4 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -314,43 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,13 +384,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -444,7 +444,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr ""
 
@@ -558,14 +558,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -599,8 +599,8 @@ msgid "Female"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -678,64 +678,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -745,16 +745,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -927,25 +927,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -979,17 +979,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1026,20 +1026,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1050,7 +1050,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1059,7 +1059,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1069,9 +1069,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1120,7 +1120,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1328,22 +1328,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1552,7 +1552,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1879,103 +1879,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2234,35 +2242,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2754,7 +2770,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2893,7 +2909,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3001,7 +3017,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3382,7 +3398,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3558,83 +3574,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3658,447 +3674,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index d305cef2d..93e7413f4 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-16 22:38+0300\n"
+"POT-Creation-Date: 2012-03-29 01:26+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"
@@ -18,6 +18,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr ""
 
@@ -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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1031,20 +1031,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2900,7 +2916,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3388,7 +3404,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3563,83 +3579,83 @@ msgstr ""
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3663,447 +3679,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/nb.po b/po/nb.po
index bb83ca03d..46c19eb42 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Generelt"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Feil i lastingen av %s"
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr "Navn"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -563,14 +563,14 @@ msgstr "Navn:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr "Kvinne"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Lukk"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Utstyr"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Hjelp"
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1031,20 +1031,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Bruk"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr "Del opp"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "Vekt:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr "Send"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Farger"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Ferdigheter"
 
@@ -2900,7 +2916,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/nl.po b/po/nl.po
index 23a5ad011..ee61c815a 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/manaplus/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Inkomende handelsaanvragen negeren"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Inkomende handelsaanvragen accepteren"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Configureren"
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Inkomende handelsaanvragen negeren"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Inkomende handelsaanvragen accepteren"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr "Naam"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Aanvallen"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Spreken"
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -563,14 +563,14 @@ msgstr "Naam:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr "Vrouwelijk"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Help"
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventaris"
@@ -1031,20 +1031,20 @@ msgstr "Sloten:"
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr "Splitsen"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr "Opslaan"
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr "Verzenden"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kon niet zenden als zender, of de brief is ongeldig."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr "Handel aanvragen"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -2900,7 +2916,7 @@ msgstr "Guild aanmaken"
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Emoticon snelkoppeling %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Snelkopeling naar voorwerp %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Omhoog"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Omlaag"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Naar links"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Naar rechts"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Viseren en Aanvallen"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Aanval stoppen"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "NPC viseren"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Speler viseren"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Oprapen"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Vensters verbergen"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Zitten"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "OK selecteren"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Snelkopeling naar voorwerp %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Help venster"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Statusvenster"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Uitrustingsvenster"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Vaardigheidsvenster"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Minimapvenster"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Gespreksvenster"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Voorwerpsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Instellingenvenster"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Debugvenster"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Emoticonsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Smilie"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Emoticon snelkoppeling %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Chat omhoogscrollen"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Chat omlaagscrollen"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Vorige chattab"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 6cd1cb331..3fa662704 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -20,6 +20,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Inkomende handelsaanvragen negeren"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Inkomende handelsaanvragen accepteren"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
@@ -37,16 +45,16 @@ msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Configureren"
 
@@ -324,43 +332,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Inkomende handelsaanvragen negeren"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Inkomende handelsaanvragen accepteren"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -394,13 +394,13 @@ msgid "Name"
 msgstr "Naam"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Aanvallen"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Spreken"
 
@@ -454,7 +454,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -568,14 +568,14 @@ msgstr "Naam:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -609,8 +609,8 @@ msgid "Female"
 msgstr "Vrouwelijk"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Andere"
 
@@ -688,64 +688,64 @@ msgstr "Niveau %d"
 msgid "(empty)"
 msgstr "(leeg)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "standaard"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "zwart"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "rood"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "groen"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "blauw"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "goud"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "geel"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "roze"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "paars"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "grijs"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "bruin"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "regenboog 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "regenboog 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "regenboog 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -755,16 +755,16 @@ msgstr "regenboog 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -937,25 +937,25 @@ msgstr "Invoer: %d bytes/sec"
 msgid "Out: %d bytes/s"
 msgstr "Uitvoer: %d bytes/sec"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "Weet u?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Vorig"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Volgend >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -989,17 +989,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Help"
 
@@ -1023,7 +1023,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventaris"
@@ -1036,20 +1036,20 @@ msgstr "Sloten:"
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1060,7 +1060,7 @@ msgstr "Neerleggen..."
 msgid "Split"
 msgstr "Splitsen"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Kleren"
@@ -1069,7 +1069,7 @@ msgstr "Kleren"
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1079,9 +1079,9 @@ msgstr "Opslaan"
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -1130,7 +1130,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
@@ -1340,22 +1340,22 @@ msgstr "Verzenden"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kon niet zenden als zender, of de brief is ongeldig."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Kleren: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Sleutel: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Verwijder uitrusting eerst"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
@@ -1564,7 +1564,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Spreuken"
 
@@ -1891,103 +1891,111 @@ msgstr "Zet mumble voice chat aan"
 msgid "Download music"
 msgstr "Download muziek"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Verwijder kleuren van ontvangen chat berichten"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Toon chat kleurenlijst"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Commando's"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Limieten"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Limiteer max karakters in chat lijn"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Limiteer max lijnen in chat"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Logs"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Zet chat log aan"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Toon chat geschiedenis"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Berichten"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Verberg verkoop boodschappen"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Toon server berichten in de debug tab"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Zet handle tab aan"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Tijd"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Gebruik lokale tijd"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2246,35 +2254,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "Aanval gecontroleerd door server aanzetten"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Bot controle aanzetten"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Toon achtergrond"
 
@@ -2772,7 +2788,7 @@ msgstr "Handel aanvragen"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -2911,7 +2927,7 @@ msgstr "Guild aanmaken"
 msgid "Create Party"
 msgstr "Groep aanmaken"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Sociaal"
 
@@ -3019,7 +3035,7 @@ msgstr "Groep Naam"
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Specialen"
 
@@ -3401,7 +3417,7 @@ msgstr "Wie Is Online - "
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -3585,83 +3601,83 @@ msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Dit commando stop met de andere speler te negeren als deze genegeerd werd."
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Bot controle"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Wie is online"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "VAAR"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "WU"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "Weet u"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "OPT"
 
@@ -3685,447 +3701,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Emoticon snelkoppeling %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Snelkoppeling naar voorwerp %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Omhoog"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Omlaag"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Naar links"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Naar rechts"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Viseren en Aanvallen"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Beweeg tot aan Doel"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Wijzig Bewegen tot aan Doel type"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Aanval stoppen"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Dichtsbijzijnde viseren"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "NPC viseren"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Speler viseren"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Oprapen"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Vensters verbergen"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Zitten"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "OK selecteren"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "Voorwerpsnelkoppelingstoets"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Snelkoppeling naar voorwerp %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Help venster"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Statusvenster"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Uitrustingsvenster"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Vaardigheidsvenster"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Minimapvenster"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Gespreksvenster"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Voorwerpsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Instellingenvenster"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Debugvenster"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Sociaal Venster"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Emoticonsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Kleren Venster"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "Snel neerleggingsvenster"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "Commando Venster"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "Bot Controle Venster"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Wie Is Online Venster"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Weet u Venster"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Smilie"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Emoticon snelkoppeling %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Draag Kledij"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Kopiëer Kledij"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Chat omhoogscrollen"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Chat omlaagscrollen"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Vorige chattab"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Snel N Voorwerpen van slot 0 neerleggen"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Snel N Voorwerpen Neerleggen"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr "Wissel Snel Neerleggingsteller"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Snel jezelf of iemand anders genezen"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Gebruik #itenplz spreuk"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Gebruik magie aanval"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "Aan / Uit audio"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/pl.po b/po/pl.po
index 815fcb4db..db568170e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 22:42+0000\n"
-"Last-Translator: derpella <matwa@poczta.pl>\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/language/"
 "pl/)\n"
 "Language: pl\n"
@@ -21,6 +21,14 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorowanie przychodzących próśb o handel"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Akceptowanie przychodzących próśb o handel"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
@@ -38,16 +46,16 @@ msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Konfiguracja"
 
@@ -328,43 +336,35 @@ msgstr "Osierocone obrazy źródłowe:"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Zrzut ekranu zapisany jako"
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorowanie przychodzących próśb o handel"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Akceptowanie przychodzących próśb o handel"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Nie można załadować mapy"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
@@ -398,13 +398,13 @@ msgid "Name"
 msgstr "Imię"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atak"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Rozmowa"
 
@@ -458,7 +458,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Wyjdź"
 
@@ -572,14 +572,14 @@ msgstr "Nazwa:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -613,8 +613,8 @@ msgid "Female"
 msgstr "Kobieta"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Inne"
 
@@ -692,64 +692,64 @@ msgstr "Poziom %d"
 msgid "(empty)"
 msgstr "(puste)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "domyślnie"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "czarny"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "czerwony"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "zielony"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "niebieski"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "złoty"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "żółty"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "różowy"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "fioletowy"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "szary"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "brązowy"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "tęczowy 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "tęczowy 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "tęczowy 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -759,16 +759,16 @@ msgstr "tęczowy 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -941,25 +941,25 @@ msgstr "Wejście: %d bajtów"
 msgid "Out: %d bytes/s"
 msgstr "Wyjście: %d bajtów"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "Cz wiesz że..."
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Cofnij"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Dalej>"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Otwieraj to okno automatycznie"
 
@@ -993,17 +993,17 @@ msgstr "Opis:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Wymagany zarówno adres jak i port serwera."
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Zdejmij"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Pomoc"
 
@@ -1027,7 +1027,7 @@ msgstr "wg. ilości"
 msgid "by type"
 msgstr "wg. typu"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inwentarz"
@@ -1040,20 +1040,20 @@ msgstr "Miejsc:"
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Użyj"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1064,7 +1064,7 @@ msgstr "Upuść..."
 msgid "Split"
 msgstr "Podziel"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Stroje"
@@ -1073,7 +1073,7 @@ msgstr "Stroje"
 msgid "Weight:"
 msgstr "Waga:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1083,9 +1083,9 @@ msgstr "Przechowaj"
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Upuść"
 
@@ -1134,7 +1134,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Waga: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Statystyki ataku:"
 
@@ -1346,22 +1346,22 @@ msgstr "Wyślij"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Strój: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Klawisz: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Najpierw zdejmij"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Strój na afk"
 
@@ -1570,7 +1570,7 @@ msgstr "Przesuwaj kamerę"
 msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Zaklęcia"
 
@@ -1897,103 +1897,111 @@ msgstr "Włącz integrację z Mumble"
 msgid "Download music"
 msgstr "Ściągnij muzykę"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Usuń kolory z odbieranych wiadomości"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Pokazuj listę kolorów czatu"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Polecenia"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Pozwól poleceniom magicznym i GM pojawiać się we wszystkich zakładkach"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Limity"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Limit znaków w wierszu czatu"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Limit wierszy w czacie"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Logi"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Włącz logowanie czatu"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Pokazuj historię czatu"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Ukryj wiadomości od sklepów"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Zakładki"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Umieść wszystkie szepty w zakładkach"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Loguj powiadomienia o magii w zakładce Debug"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Pokazuj wiadomości serwera w zakładce Debug"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Włącz tab handlowy"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Włącz zakładkę bitewną"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Pokazuj wydarzenia bitewne"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Jeśli potrzeba, zmień rozmiar zakładek czatu"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Czas"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Użyj lokalnego czasu"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "Podświetlaj słowa (oddzielaj przecinkiem)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr "Pokazuj wiadomości MVP"
 
@@ -2252,35 +2260,43 @@ msgstr "Włącz integrację z AuctionBotem"
 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:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "Włącz atak ze strony serwera"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Włącz wykrywacza botów"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Włącz ochronę przeciw zbugowanym serwerom"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Włącz logowanie Debug"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Tryb niskiego transferu"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Chowaj obrazek tarczy"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Używaj FBO do screenshotów (tylko w OpenGL)"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Pokazuj tło"
 
@@ -2777,7 +2793,7 @@ msgstr "Prośba o handel"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s%s, akceptujesz?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -2916,7 +2932,7 @@ msgstr "Utwórz gildię"
 msgid "Create Party"
 msgstr "Utwórz grupę"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Społeczność"
 
@@ -3024,7 +3040,7 @@ msgstr "Nazwa grupy"
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Specjalne"
 
@@ -3406,7 +3422,7 @@ msgstr "Gracze online- "
 msgid "Who Is Online - error"
 msgstr "Gracze online- błąd"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Gracze online- aktualizacja"
 
@@ -3581,83 +3597,83 @@ msgstr "Komenda: /unignore <gracz>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "To polecenie przerywa ignorowanie gracza, jeśli był ignorowany."
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "WB"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Wykrywacz botów"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Gracze online"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "SB"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Emotki"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Stan"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "EKW"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "INW"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "SKI"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "SK"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Skróty"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "MG"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "UP"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "WŻ"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "Czy wiesz, że..."
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "SET"
 
@@ -3681,449 +3697,437 @@ msgstr "Magazyn"
 msgid "Cart"
 msgstr "Wózek"
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Skrót Emotki %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Skrót przedmiotu %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
+"się problemy."
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr "key_%d"
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr "nieznany klawisz"
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr "(nieznany)"
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "Podstawowe klawisze"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Idź do góry"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Idź w dół"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Idź w lewo"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Idź w prawo"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Namierz i Atakuj"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Podejdź do celu"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Zmień sposób podchodzenia do celu"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "Podejdź do lokacji domowej"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "Ustaw lokację domową"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "Podejdź do punktu nawigacyjnego"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Zatrzymaj Atak"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr "Przestań namierzać"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Celuj w najbliższe"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Namierz NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Namierz Gracza"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Podnieś"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Zmień sposób podnoszenia"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Ukryj Okna"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Usiądź"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Zmień widok mapy"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Wybrano OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "Klawisze skrótu"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "Klawisz skrótu przedmiotu"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Skrót przedmiotu %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "Klawisze okien"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Okno Pomocy"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Okno statusu"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Okno Inwentarza"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Okno Ekwipunku"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Okno Umiejętności"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Okno Minimapy"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Okno Czatu"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Okno Skrótów przedmiotów"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Okno Ustawień"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Okno diagnostyczne"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Okno społeczne"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Okno Skrótów Emotek"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Okno strojów"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "Okno sklepu"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "Okno szybkiego upuszczania"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "Okno statystyk bitewnych"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "Okno poleceń"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "Okno wykrywacza botów"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Okno graczy online"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Okno \"Czy wiesz że...\""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "Poprzednia zakładka społeczna"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "Następna zakładka społeczna"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "Klawisze emotek"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Emotikonka"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Skrót Emotki %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "Klawisze stroju"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Nałóż strój"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Kopiuj strój"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Skopiuj ekwipunek do stroju"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "Klawisze czatu"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Przełącznik Czatu"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Przewiń czat do góry"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Przewiń czat w doł"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Poprzednia zakładka czatu"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Następna zakładka czatu"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Zamknij bieżącą zakładkę czatu"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Poprzedni wiersz czatu"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Następny wiersz czatu"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "Dopełnianie w czacie"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "Wyłącz wpisywanie do czatu"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "Inne"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignoruj wprowadzenie 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "Skieruj się w górę"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "Skieruj się w dół"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "Skieruj się w lewo"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "Skieruj się w prawo"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "Szalone ruchy"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "Zmień tryb szalonych ruchów"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Szybkie upuszczenie N przedmiotów z pozycji 0"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Szybkie upuszczenie N przedmiotów"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr "Zmień licznik szybkiego upuszczania"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Szybkie leczenie celu lub siebie"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Użyj zaklęcia #itenplz"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Użyj magicznego ataku"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "Przełącz magiczny atak"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr "Przełącz atak PvP"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "Zmień tryb poruszania się"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "Zmień rodzaj broni"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "Zmień rodzaj ataku"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "Zmień rodzaj podążania"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "Zmień rodzaj imitacji"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr "Włącz/ wyłącz klawisze modyfikatorów gry"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "Włącz/ wyłącz dźwięk"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Włącz/ wyłącz tryb AFK"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "Emuluj prawe kliknięcie klawiaturą"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "Przełącz tryb kamery"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "Klawisz modyfikatora"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
-"się problemy."
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr "key_%d"
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr "nieznany klawisz"
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr "(nieznany)"
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/pt.po b/po/pt.po
index adde94bd6..231721749 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/"
 "language/pt/)\n"
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorando propostas de negócios"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Aceitando propostas de negócios"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Visivel no mapa"
@@ -38,16 +46,16 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Configurar"
 
@@ -325,43 +333,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorando propostas de negócios"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Aceitando propostas de negócios"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -395,13 +395,13 @@ msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Falar"
 
@@ -455,7 +455,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Sair"
 
@@ -569,14 +569,14 @@ msgstr "Nome:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -610,8 +610,8 @@ msgid "Female"
 msgstr "Mulher"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Outro"
 
@@ -689,64 +689,64 @@ msgstr "Nível %d"
 msgid "(empty)"
 msgstr "(vazio)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "padrão"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "preto"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "vermelho"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "verde"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "azul"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "ouro"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "amarelo"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "rosa"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "roxo"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "cinza"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "marrom"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "arco-íris 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "arco-íris 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "arco-íris 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -756,16 +756,16 @@ msgstr "arco-íris 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -938,25 +938,25 @@ msgstr "Entrada: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "Você sabia?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Anterior"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Próximo >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Abrir automaticamente esta janela"
 
@@ -990,17 +990,17 @@ msgstr "Descrição:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor coloque ao menos uma porta de servidor."
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Ajuda"
 
@@ -1024,7 +1024,7 @@ msgstr "por quantidade"
 msgid "by type"
 msgstr "por tipo"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventário"
@@ -1037,20 +1037,20 @@ msgstr "Slots:"
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1061,7 +1061,7 @@ msgstr "Descartar..."
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Roupas"
@@ -1070,7 +1070,7 @@ msgstr "Roupas"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1080,9 +1080,9 @@ msgstr "Armazenar"
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Descartar"
 
@@ -1131,7 +1131,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Estatísticas"
 
@@ -1246,7 +1246,7 @@ msgstr "Servidor:"
 #: src/gui/logindialog.cpp:129
 #, c-format
 msgid "Update host: %s"
-msgstr ""
+msgstr "Atualizando Servidores: %s"
 
 #: src/gui/logindialog.cpp:145
 msgid "Custom update host"
@@ -1341,22 +1341,22 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Desequipar antes"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
@@ -1565,7 +1565,7 @@ msgstr "Mover câmera"
 msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Feitiços"
 
@@ -1892,103 +1892,111 @@ msgstr "Habilitar o chat de voz mumble \"requer aplicativo mumble\""
 msgid "Download music"
 msgstr "Baixar músicas"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Cores"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Remover mensagens coloridas do chat"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Mostrar lista de cores do chat"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Permitir feitiços e comandos de GM em todas abas"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Limites"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Limite de caracteres na linha de chat"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Limite de linhas máximas no chat"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Logs"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Salvar conversas"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Mostrar mensagens antigas"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Mensagens"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Esconder mensagens de loja"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Abas"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens privadas em abas"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar as abas de chat caso precisar"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Tempo"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Usar hora local"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "Palavras Destacadas (separadas por vírgulas)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr "Ver mensagens MVP"
 
@@ -2247,35 +2255,43 @@ msgstr "Habilitar suporte ao AuctionBot "
 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:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção contra bugs no servidor (não desabilitar)"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
@@ -2771,7 +2787,7 @@ msgstr "Proposta de negociação"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -2910,7 +2926,7 @@ msgstr "Criar guilda"
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Social"
 
@@ -3018,7 +3034,7 @@ msgstr "Nome do grupo"
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Especiais"
 
@@ -3399,7 +3415,7 @@ msgstr "Quem está online - "
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3576,83 +3592,83 @@ msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "AB"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Analisador de bot"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Quem esta online"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "EST"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Smileys"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "HAB"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "AT"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "FE"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "DE"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "VS"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "Você sabia"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "CON"
 
@@ -3676,449 +3692,437 @@ msgstr "Armazém"
 msgid "Cart"
 msgstr "Carrinho"
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Atalho para emoticon %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Atalho para item %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
+"comprometer a jogabilidade."
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr "tecla_%d"
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr "Tecla desconhecida"
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr "Tecla u"
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "Teclas básicas"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Mover para Cima"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Esquerda"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Direita"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Selecionar & Atacar"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Mover para o alvo"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Mudar o tipo de movimento ao alvo"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "Mover para localização"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "Definir localização"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "Mover para ponto de navegação"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Parar ataque"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr "Remover alvo"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Selecionar alvo mais próximo"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Selecionar NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Selecionar Jogador"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Pegar item"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Esconder janelas"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Sentar"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Selecionar OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "Teclas de atalho"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "Atalhos de item"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Atalho para item %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "Teclas de janelas"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Janela de Ajuda"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Janela de Status"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Janela de equipamento"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Janela de Minimapa"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Janela de chat"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Janela de Configurações"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Janela de Depuração"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Janela social"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para emoticons"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Janela de roupas"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "Janela Loja"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "Janela Descarte rápido"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "Janeja de mortes"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "Janela Comandos"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "Janela Analisador de bot"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Janela Quem está online"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Janela Você sabia"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "Aba social anterior"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "Teclas de emoções"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Emoticon"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Atalho para emoticon %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "Teclas de vestuario"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "Teclas de conversação"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "Chat auto completar"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "Desativar entrada de chat"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "Outras teclas"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "Para cima"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "Para baixo"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "Para esquerda"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "Para direita"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo(a)"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr "Trocar ataque de pvp"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "Modificar chave"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
-"comprometer a jogabilidade."
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ec289e613..e7ae159df 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
 "manaplus/language/pt_BR/)\n"
@@ -23,6 +23,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorando propostas de negócios"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Aceitando propostas de negócios"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Mapa visivel "
@@ -40,16 +48,16 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Configurar"
 
@@ -327,43 +335,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorando propostas de negócios"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Aceitando propostas de negócios"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -397,13 +397,13 @@ msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Falar"
 
@@ -457,7 +457,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Sair"
 
@@ -571,14 +571,14 @@ msgstr "Nome:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -612,8 +612,8 @@ msgid "Female"
 msgstr "Mulher"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Outro"
 
@@ -691,64 +691,64 @@ msgstr "Nível %d"
 msgid "(empty)"
 msgstr "(vazio)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "padrão"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "preto"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "vermelho"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "verde"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "azul"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "ouro"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "amarelo"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "rosa"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "roxo"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "cinza"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "marrom"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "arco-íris 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "arco-íris 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "arco-íris 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -758,16 +758,16 @@ msgstr "arco-íris 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -940,25 +940,25 @@ msgstr "Entrada: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "Você Sabia?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Anterior"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Próximo >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Auto abrir esta janela"
 
@@ -992,17 +992,17 @@ msgstr "Descrição:"
 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."
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Ajuda"
 
@@ -1026,7 +1026,7 @@ msgstr "por quantidade"
 msgid "by type"
 msgstr "por tipo"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventário"
@@ -1039,20 +1039,20 @@ msgstr "Slots:"
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1063,7 +1063,7 @@ msgstr "Descartar..."
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Roupas"
@@ -1072,7 +1072,7 @@ msgstr "Roupas"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1082,9 +1082,9 @@ msgstr "Armazenar"
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Descartar"
 
@@ -1133,7 +1133,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Estatísticas"
 
@@ -1248,7 +1248,7 @@ msgstr "Servidor:"
 #: src/gui/logindialog.cpp:129
 #, c-format
 msgid "Update host: %s"
-msgstr ""
+msgstr "Atualizando Servidor: %s"
 
 #: src/gui/logindialog.cpp:145
 msgid "Custom update host"
@@ -1343,22 +1343,22 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Desequipar antes"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
@@ -1567,7 +1567,7 @@ msgstr "Mover câmera "
 msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Feitiços"
 
@@ -1894,103 +1894,111 @@ msgstr "Habilitar o chat de voz mumble (requer aplicativo mumble)"
 msgid "Download music"
 msgstr "Baixar músicas"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Cores"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Remover mensagens coloridas do chat"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Mostrar lista de cores do chat"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Permitir feitiços e comandos de GM em todas abas"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Limites"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Limite de caracteres na linha de chat"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Limite de linhas máximas no chat"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Logs"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Salvar conversas"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Mostrar mensagens antigas"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Mensagens"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Esconder mensagens de loja"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Abas"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens privadas em abas"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar aba de chat caso precisar"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Tempo"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Usar tempo local"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "Palavras destacadas (separadas em vírgulas)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr "Ver Mensagens MVP"
 
@@ -2249,35 +2257,43 @@ msgstr "Habilitar suporte ao AuctionBot "
 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:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção para servidores com bugs (não desabilitar)"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
@@ -2774,7 +2790,7 @@ msgstr "Proposta de negociação"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -2913,7 +2929,7 @@ msgstr "Criar guilda"
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Social"
 
@@ -3021,7 +3037,7 @@ msgstr "Nome do grupo"
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Especiais"
 
@@ -3402,7 +3418,7 @@ msgstr "Quem está online - "
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3579,83 +3595,83 @@ msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "AB"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Analisador de bot"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Quem esta online"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "EST"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Smileys:"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "HAB"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "AT"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "FE"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "DE"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "Você Sabia"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "CON"
 
@@ -3679,449 +3695,437 @@ msgstr "Armazém"
 msgid "Cart"
 msgstr "Carrinho"
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Atalho para emoticon %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Atalho para item %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
+"comprometer a jogabilidade."
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr "tecla_%d"
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr "Tecla desconhecida"
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr "tecla u"
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "Teclas básicas"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Mover para Cima"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Esquerda"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Direita"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Selecionar & Atacar"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Mover para o alvo"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Mudar o tipo de movimento ao alvo"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "Mover para localização"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "Definir localização"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "Mover para ponto de navegação"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Parar ataque"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr "Remover alvo"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Selecionar alvo mais próximo"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Selecionar NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Selecionar Jogador"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Pegar item"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Esconder janelas"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Sentar"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Selecionar OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "Teclas de atalho"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "Atalhos de item"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Atalho para item %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "Teclas de janelas"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Janela de Ajuda"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Janela de Status"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Janela de equipamento"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Janela de Minimapa"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Janela de chat"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Janela de Configurações"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Janela de Depuração"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Janela social"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para emoticons"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Janela de roupas"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "Janela Loja"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "Janela Descarte rápido"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "Janela de estado de mortes"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "Janela Comandos"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "Janela Analisador de bot"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Janela Quem está online"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Janela Você Sabia "
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "Aba social anterior"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "Teclas de emoções"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Emoticon"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Atalho para emoticon %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "Teclas de vestuario"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "Teclas de conversasão"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "Chat auto completar"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "Desativar entrada de chat"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "Outras teclas"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "Para cima"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "Para baixo"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "Para esquerda"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "Para direita"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo(a)"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr "Mudar ataque em pvp"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "Chave de modificação"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
-"comprometer a jogabilidade."
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/ru.po b/po/ru.po
index 5228fbf25..baaee7164 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:44+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/"
 "language/ru/)\n"
@@ -23,6 +23,14 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Игнорировать предложения о торговле"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Принимать предложения о торговле"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Видимые на карте"
@@ -40,16 +48,16 @@ msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Настройка"
 
@@ -333,43 +341,35 @@ msgstr ""
 "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
 "\"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Игнорировать предложения о торговле"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Принимать предложения о торговле"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -403,13 +403,13 @@ msgid "Name"
 msgstr "Имя"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Атака"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Разговор"
 
@@ -463,7 +463,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Выход"
 
@@ -577,14 +577,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -618,8 +618,8 @@ msgid "Female"
 msgstr "Женщина"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Другое"
 
@@ -697,64 +697,64 @@ msgstr "Уровень: %d"
 msgid "(empty)"
 msgstr "(пусто)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "По умолчанию"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "черный"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "красный"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "зеленый"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "синий"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "золотой"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "желтый"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "розовый"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "фиолетовый"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "серый"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "коричневый"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "радуга 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "радуга 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "радуга 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -764,16 +764,16 @@ msgstr "радуга 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -946,25 +946,25 @@ msgstr "Вх.: %d байт/сек."
 msgid "Out: %d bytes/s"
 msgstr "Исх.: %d байт/сек."
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "Вы знаете?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Предыдущий"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Следующий >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Автоматически открывать это окно"
 
@@ -998,17 +998,17 @@ msgstr "Описание:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Пожалуйста введите хотябы адрес и порт сервера"
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Снять"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Помощь"
 
@@ -1032,7 +1032,7 @@ msgstr "по кол-ву."
 msgid "by type"
 msgstr "по типу"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Инвентарь"
@@ -1045,20 +1045,20 @@ msgstr "Вместимость:"
 msgid "Filter:"
 msgstr "Фильтр:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Использовать"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1069,7 +1069,7 @@ msgstr "Бросить"
 msgid "Split"
 msgstr "Разделить"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Наряды"
@@ -1078,7 +1078,7 @@ msgstr "Наряды"
 msgid "Weight:"
 msgstr "Вес:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1088,9 +1088,9 @@ msgstr "Сохранить"
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Бросить"
 
@@ -1139,7 +1139,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Вес: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Окно статистики атак"
 
@@ -1351,22 +1351,22 @@ msgstr "Отправить"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Наряд: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Клавиша: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Сначала снять"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "наряд отсутствия"
 
@@ -1575,7 +1575,7 @@ msgstr "Передвинуть камеру"
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Заклинания"
 
@@ -1902,103 +1902,111 @@ msgstr "Включить голосовой чат mumble"
 msgid "Download music"
 msgstr "Скачать музыку"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr "Окно"
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr "Автоматически прятать окно чата."
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Удалить цвета из полученных сообщений в чате"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Показать список цветов чата"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Команды"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Разрешить магические и администраторские команды на всех вкладках"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Ограничения"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Ограничить число символов в строке чата"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Ограничить число строк в чате"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Логи"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Включить лог чата"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Показать историю чата"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Сообщения"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Скрыть сообщения магазина"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Страницы"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Личные сообщения во вкладках"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Оставлять сообщения магии на вкладке отладки"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Показывать сообщения сервера на вкладке отладки"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Включить вкладки торговли"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Включить вкладку боя"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Показать сообщения боя"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Подгонять размер чата"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Время"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Использовать местное время"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "Подсвечиваемые слова (разделенные запятыми)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr "Показывать MVP сообщения"
 
@@ -2257,35 +2265,43 @@ msgstr "Включить поддержку бота аукционов"
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Включить поддержку гильд-бота"
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr "Окна"
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr "Автоматически прятать экранные кнопки."
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Включить защиту от бажных серверов (не выключать!)"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Режим кеширования игроков"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Спрятать картинку счита"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Использовать FBO для скриншотов (только в режиме opengl)"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Показать фон"
 
@@ -2788,7 +2804,7 @@ msgstr "Запрос на Торговлю"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s хочет %s %s, вы принимаете предложение?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Умения"
 
@@ -2927,7 +2943,7 @@ msgstr "Создать Гильдию"
 msgid "Create Party"
 msgstr "Создать группу"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Общество"
 
@@ -3035,7 +3051,7 @@ msgstr "Имя группы"
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Особые"
 
@@ -3417,7 +3433,7 @@ msgstr "Кто онлайн - "
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -3595,83 +3611,83 @@ msgstr "Команда: /unignore <игрок>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "ДБ"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Окно детектора ботов"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "КО"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Кто онлайн"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "СА"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Смайлы"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "СО"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Состояние"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "СН"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "ИНВ"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "УМ"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "СПЕ"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "ОБЩ"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "ГК"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Горячие клавиши"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "ЗАК"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "БР"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "ВЗ"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "Вы знаете?"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "ОПЦ"
 
@@ -3695,449 +3711,437 @@ msgstr "Хранилище"
 msgid "Cart"
 msgstr "Телега"
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Комбинация клавиш для смайла %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Комбинация клавиш быстрого предмета %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
+"вести."
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr "кнопка_%d"
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr "неизвестная кнопка"
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr "неиз."
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "Основные клавиши"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Движение вверх"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Движение вниз"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Движение влево"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Движение вправо"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Прицел и атака"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Движение к цели"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Изменение типа движения и атаки"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "Переход к Домашней локации"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "Установка Домашней локации"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "Движение к навигационной точке"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Остановка атаки"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr "снять выделение"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Выбор ближнего монстра"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Выбор NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Выбор игрока"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Поднятие предметов"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Изменение типа подбора предметов"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Скрытие окон"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Приседание/Вставание"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Создание скриншота"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Разрешение/Запрет торговли"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Изменение режима отображения карты"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Выбор Ok"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "Клавиши быстрых действий"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "Горячие клавиши предметов"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Комбинация клавиш быстрого предмета %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "Клавиши окон"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Окно помощи"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Окно статуса"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Окно инвентаря"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Окно экипировки"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Окно навыков"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Окно мини-карты"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Окно чата"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Окно быстрого использования предметов"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Окно настроек"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Окно отладки"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Окно общества"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Окно эмоций"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Окно нарядов"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "Окно магазина"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "Окно быстрого бросания предметов"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "Окно статистики атак"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "Окно команд"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "Окно детектора ботов"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Окно кто онлайн"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Окно \"Вы знаете?\""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "Предыдущая закладка общества"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "Следующая закладка общества"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "Клавиши смайлов"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Смайлы"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Комбинация клавиш для смайла %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "Клавиши нарядов"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Надеть наряд"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Копировать наряд"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Копирование надетого наряда"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "Клавиши чата"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Переключение на чат"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Прокручивание чата вверх"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Прокручивание чата вниз"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Предыдущая закладка чата"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Следующая закладка чата"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Закрыть текущую вкладку чата"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Предыдущая строка чата"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Следующая строка чата"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "Автозавершение в чате"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "Отключение фокуса ввода"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "Другие клавиши"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Игнорирование ввода 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Игнорирование ввода 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "Повернуться вверх"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "Повернуться вниз"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "Повернуться влево"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "Повернуться вправо"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "Сумасшедшие движения"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "Поменять режим сумасшедших движений"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Быстрый сброс N предметов из 0 слота"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Быстрый сброс N предметов"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr "Переключение счётчика быстрого сброса"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Быстрое лечения себя или цели"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Использование заклинания #itenplz"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Использование магической атаки"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "Переключение маг. атаки"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr "Переключение pvp атаки"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "Изменение типа движения"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "Измение типа атаки оружием"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "Изменение типа атаки"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "Изменение режима следования"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "Изменение режима имитации"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr "Включение / Выключение специальных модификаторов"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "Вкл. / Выкл. звука"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Включение / Выключение режима отошел"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "Эмуляция правого клика с клавиатуры"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "Изменение режима камеры"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "Кнопка-модификатор"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
-"вести."
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr "кнопка_%d"
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr "неизвестная кнопка"
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr "неиз."
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/sk.po b/po/sk.po
index 0000432f6..27cef490f 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Nastavenie"
 
@@ -324,43 +332,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -394,13 +394,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -454,7 +454,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Ukončiť"
 
@@ -568,14 +568,14 @@ msgstr "Meno"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -609,8 +609,8 @@ msgid "Female"
 msgstr "Žena"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -688,64 +688,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -755,16 +755,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
@@ -937,25 +937,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -989,17 +989,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Vybavenie"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Odstrojiť"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Nápoveda"
 
@@ -1023,7 +1023,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventár"
@@ -1036,20 +1036,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Vystrojiť"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Použiť"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1060,7 +1060,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1069,7 +1069,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1079,9 +1079,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Zahodiť"
 
@@ -1130,7 +1130,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1342,22 +1342,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1566,7 +1566,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1893,103 +1893,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2248,35 +2256,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2768,7 +2784,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Schopnosti"
 
@@ -2907,7 +2923,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3015,7 +3031,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3396,7 +3412,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3572,83 +3588,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3672,447 +3688,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/sq.po b/po/sq.po
index 8573e1c29..789296425 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr ""
 
@@ -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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1031,20 +1031,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2900,7 +2916,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/sv.po b/po/sv.po
index 3baac3a8f..12863f321 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorerar handelserbjudanden"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Accepterar handelserbjudanden"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Inställningar"
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Alternativ till /%s är ”yes”, ”no”, ”true”, ”false”, ”1”, ”0”."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Allmänt"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Nätverksfel"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorerar handelserbjudanden"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Accepterar handelserbjudanden"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunde inte ladda %s"
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr "Namn"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attackera"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Prata"
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -563,14 +563,14 @@ msgstr "Namn:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr "Kvinna"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Hjälp"
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventarium"
@@ -1031,20 +1031,20 @@ msgstr "Utrymme:"
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Använd"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr "Dela"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "Vikt:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr "Lagra"
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Släpp"
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ 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:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Färger"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Visa alla viskningar i egna flikar"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr "Förfrågan om byteshandel"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Färdigheter"
 
@@ -2900,7 +2916,7 @@ msgstr "Skapa gille"
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Tangent för smiley %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Tangent för snabbåtkomst %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Gå uppåt"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Gå nedåt"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Gå åt vänster"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Gå åt höger"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Välj & attackera"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Sluta attackera"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Välj NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Välj spelare"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Plocka upp"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Dölj fönster"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Sitt"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Skärmbild"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Tillåt/neka handel"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Välj okej"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Tangent för snabbåtkomst %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Hjälpfönster"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Statusfönster"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Inventorium"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Utrustningsfönster"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Färdighetsfönster"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Minikarta"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Chattfönster"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Snabbåtkomstfönster"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Inställningsfönster"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Smileyfönster"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Smiley"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Tangent för smiley %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Växla chattfönster"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Rulla upp chatt"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Rulla ned chatt"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Föregående chattflik"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Nästa chattflik"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignorera inmatning 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignorera inmatning 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 79a831ee7..ae6fbce1c 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,14 @@ msgstr ""
 "Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -34,16 +42,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -318,43 +326,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -388,13 +388,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -448,7 +448,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr ""
 
@@ -562,14 +562,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -603,8 +603,8 @@ msgid "Female"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -682,64 +682,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -749,16 +749,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -931,25 +931,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -983,17 +983,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1017,7 +1017,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1030,20 +1030,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1054,7 +1054,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1063,7 +1063,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1073,9 +1073,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1124,7 +1124,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1334,22 +1334,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1885,103 +1885,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2240,35 +2248,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2760,7 +2776,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2899,7 +2915,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3007,7 +3023,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3388,7 +3404,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3564,83 +3580,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3664,447 +3680,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/te.po b/po/te.po
index f5881522c..f98d44cb5 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -319,43 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "సాధారణ"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,13 +389,13 @@ msgid "Name"
 msgstr "పేరు"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "నిష్క్రమించు"
 
@@ -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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -604,8 +604,8 @@ msgid "Female"
 msgstr "స్త్రీ"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -683,64 +683,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -750,16 +750,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -932,25 +932,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -984,17 +984,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "సహాయం"
 
@@ -1018,7 +1018,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1031,20 +1031,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "బరువు:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1074,9 +1074,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1335,22 +1335,22 @@ msgstr "పంపించు"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1886,103 +1886,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "రంగులు"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2241,35 +2249,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2761,7 +2777,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2900,7 +2916,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3008,7 +3024,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3389,7 +3405,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3565,83 +3581,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3665,447 +3681,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/th.po b/po/th.po
index 55583f97e..8bfdf70de 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "ตั้งค่า"
 
@@ -314,43 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,13 +384,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -444,7 +444,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "ออก"
 
@@ -558,14 +558,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -599,8 +599,8 @@ msgid "Female"
 msgstr "หญิง"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -678,64 +678,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -745,16 +745,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -927,25 +927,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -979,17 +979,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1026,20 +1026,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "ใช้"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1050,7 +1050,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1059,7 +1059,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1069,9 +1069,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "ทิ้ง"
 
@@ -1120,7 +1120,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1328,22 +1328,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1552,7 +1552,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1879,103 +1879,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2234,35 +2242,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2754,7 +2770,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2893,7 +2909,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3001,7 +3017,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3382,7 +3398,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3558,83 +3574,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "สถานะ"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3658,447 +3674,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/tr.po b/po/tr.po
index 10b997509..0a99f0f5f 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Gelen takas istekleri görmezden geliniyor."
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Gelen takas istekleri kabul ediliyor"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Kur"
 
@@ -314,43 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "Genel"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "Ekrangörüntüsü kaydı başarısız."
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Gelen takas istekleri görmezden geliniyor."
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Gelen takas istekleri kabul ediliyor"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,13 +384,13 @@ msgid "Name"
 msgstr "İsim"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Saldırı"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Konuş"
 
@@ -444,7 +444,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Çıkış"
 
@@ -558,14 +558,14 @@ msgstr "İsim:"
 #. 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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -599,8 +599,8 @@ msgid "Female"
 msgstr "Kadın"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -678,64 +678,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -745,16 +745,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Sohbet"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -927,25 +927,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Kapat"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -979,17 +979,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Ekipman"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Yardım"
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Envanter"
@@ -1026,20 +1026,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "Donatmak"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "Kullan"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1050,7 +1050,7 @@ msgstr ""
 msgid "Split"
 msgstr "Bölme"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1059,7 +1059,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "Ağırlık:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1069,9 +1069,9 @@ msgstr "Depo"
 msgid "Retrieve"
 msgstr "Almak"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1120,7 +1120,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1328,22 +1328,22 @@ msgstr "Gönder"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1552,7 +1552,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1879,103 +1879,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2234,35 +2242,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2754,7 +2770,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Beceriler"
 
@@ -2893,7 +2909,7 @@ msgstr "Birlik oluşturma"
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3001,7 +3017,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3382,7 +3398,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3558,83 +3574,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Durum"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3658,447 +3674,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Yukarı Taşı"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Aşağı Taşı"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Sola Taşı"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Hedef Oyuncu"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Ekran Görüntüsü"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Durum penceresi"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Sohbet Penceresi"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Hata Ayıklama Penceresi"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/vls.po b/po/vls.po
index 6050c5abe..8148aea0f 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.net/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,14 @@ msgstr ""
 "Language: vls\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -34,16 +42,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr ""
 
@@ -318,43 +326,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -388,13 +388,13 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -448,7 +448,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr ""
 
@@ -562,14 +562,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -603,8 +603,8 @@ msgid "Female"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -682,64 +682,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -749,16 +749,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -931,25 +931,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -983,17 +983,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr ""
 
@@ -1017,7 +1017,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr ""
@@ -1030,20 +1030,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1054,7 +1054,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1063,7 +1063,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1073,9 +1073,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr ""
 
@@ -1124,7 +1124,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1334,22 +1334,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1885,103 +1885,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2240,35 +2248,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2760,7 +2776,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -2899,7 +2915,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3007,7 +3023,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3388,7 +3404,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3564,83 +3580,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3664,447 +3680,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3bfc5ffd9..62d9e892b 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "忽略新进的交易请求"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "接受传入的交易请求"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "在地图上可见"
@@ -38,16 +46,16 @@ msgid "miss"
 msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "魔法攻击"
 
@@ -317,43 +325,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "忽略新进的交易请求"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "接受传入的交易请求"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -387,13 +387,13 @@ msgid "Name"
 msgstr "姓名"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻击"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "说话"
 
@@ -447,7 +447,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "退出"
 
@@ -561,14 +561,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -602,8 +602,8 @@ msgid "Female"
 msgstr "美女"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "其他"
 
@@ -681,64 +681,64 @@ msgstr "等级 %d"
 msgid "(empty)"
 msgstr "()"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "默认"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "黑色"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "红色"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "绿色"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "蓝色"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "金"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "黄色"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "粉红色"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "紫"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "灰色"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "棕色"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "彩虹1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "彩虹2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "彩虹3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -748,16 +748,16 @@ msgstr "彩虹3"
 msgid "???"
 msgstr "？？？"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -930,25 +930,25 @@ msgstr "输入:%d 字节/"
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "你知道吗？"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "<上一页"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "下一页>"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "自动打开这个窗口"
 
@@ -982,17 +982,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "帮助"
 
@@ -1016,7 +1016,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "物品栏"
@@ -1029,20 +1029,20 @@ msgstr "槽："
 msgid "Filter:"
 msgstr "过滤器："
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1053,7 +1053,7 @@ msgstr "掉落... ..."
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "套装"
@@ -1062,7 +1062,7 @@ msgstr "套装"
 msgid "Weight:"
 msgstr "重量："
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1072,9 +1072,9 @@ msgstr "存储"
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "丢弃"
 
@@ -1123,7 +1123,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "重量：%s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "杀敌统计"
 
@@ -1331,22 +1331,22 @@ msgstr "发送"
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "套装： %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "按键：%s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1555,7 +1555,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "法术"
 
@@ -1882,103 +1882,111 @@ msgstr "启用语音聊天"
 msgid "Download music"
 msgstr "下载音乐"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "颜色"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "从收到的聊天消息中删除颜色"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "显示聊天颜色列表"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "命令"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "允许在所有聊天标签中使用魔法和GM命令"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "限制"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "限制聊天的最大"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "日志"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "启用聊天记录"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "显示聊天记录"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "消息"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "隐藏商店消息"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "标签"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "将所有密语放于标签夜"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "在调试选项卡中显示服务器的消息"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "标签"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "启用战斗“选项卡"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "显示的战斗事件"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "时间"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "使用本地时间"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2237,35 +2245,43 @@ msgstr "启用拍卖挂机支持"
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "显示背景"
 
@@ -2757,7 +2773,7 @@ msgstr "请求交易"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗？"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "技能"
 
@@ -2896,7 +2912,7 @@ msgstr "创建帮会"
 msgid "Create Party"
 msgstr "建立"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3004,7 +3020,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "特价商品"
 
@@ -3384,7 +3400,7 @@ msgstr "谁在线 -"
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -3559,83 +3575,83 @@ msgstr "命令: /unignore <玩家>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "挂机检查"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "谁在线"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "表情符号"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "你知道吗"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "SET"
 
@@ -3659,447 +3675,435 @@ msgstr "仓库"
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "表情快捷键为 %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "物品快捷 %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "基本按键"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "向上移动"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "向下移动"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "向左移动"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "向右移动"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "对准并攻击"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "移动到目标"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "更改移动到目标类型"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "移动到首页位置"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "设为首页位置"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "移动导航点"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "停止攻击"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "目标最接近"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "目标NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "目标玩家"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "捡起"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "更改皮卡型"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "隐藏窗口"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "屏幕快照"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "更改地图浏览模式"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "选择OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "快捷按键"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "项目的快捷键"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "物品快捷 %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "窗口按键"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "帮助窗口"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "状态窗口"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "物品栏窗口"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "装备窗口"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "技能窗口"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "小地图窗口"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "聊天窗口"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "物品快捷窗口"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "设置窗口"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Debug窗口"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "社会窗口"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "表情快捷窗口"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "套装窗口"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "橱窗"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "快速下拉窗口"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "杀敌统计窗口"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "命令的窗口"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "挂机检查窗口"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "谁是在线窗口"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "你知道吗窗口"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "上一页社会标签"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "表情按键"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "笑脸"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "表情快捷键为 %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "套装按键"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "装备套装"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "聊天按键"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "关闭当前聊天标签"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "自动完成交谈"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "停用聊天输入"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "其他按键"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "直接向上"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "直接下"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "直接离开"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "直接对"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "疯狂移动"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "更改疯狂移动模式"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "快速下降序号项目"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "快速愈合的目标或自我"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "使用魔法攻击"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "切换魔法攻击"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "更改移动类型"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "更改攻击型武器"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "更改攻击类型"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "更改跟随模式"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "更改仿模式"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "开/关 音频"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "启用/禁用离开模式"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "从键盘模拟右键单击"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "切换模式"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "修改按键"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 46840dc7a..650cc68a7 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr ""
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "設定"
 
@@ -314,43 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr ""
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,13 +384,13 @@ msgid "Name"
 msgstr "名字"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr ""
 
@@ -444,7 +444,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "離開"
 
@@ -558,14 +558,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -599,8 +599,8 @@ msgid "Female"
 msgstr "女生"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -678,64 +678,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -745,16 +745,16 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -927,25 +927,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -979,17 +979,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "裝備"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "卸下裝備"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "說明"
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "物品攔"
@@ -1026,20 +1026,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "裝備"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1050,7 +1050,7 @@ msgstr ""
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1059,7 +1059,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1069,9 +1069,9 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "丟棄"
 
@@ -1120,7 +1120,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1328,22 +1328,22 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1552,7 +1552,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1879,103 +1879,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
-msgid "Colors"
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2234,35 +2242,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2754,7 +2770,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "技能"
 
@@ -2893,7 +2909,7 @@ msgstr ""
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3001,7 +3017,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3382,7 +3398,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3558,83 +3574,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "狀態"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3658,447 +3674,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9ee0b12d1..77f92a1b2 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-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "忽略收到的交易要求"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "接受收到的交易要求"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr ""
@@ -35,16 +43,16 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "設定"
 
@@ -314,43 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"、\"0\"。"
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "忽略收到的交易要求"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "接受收到的交易要求"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "載入 %s 時發生錯誤"
@@ -384,13 +384,13 @@ msgid "Name"
 msgstr "名字"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻擊"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "說話"
 
@@ -444,7 +444,7 @@ msgstr "減少"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "離開"
 
@@ -558,14 +558,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:85
+#: src/gui/outfitwindow.cpp:88
 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:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr ""
 
@@ -599,8 +599,8 @@ msgid "Female"
 msgstr "女生"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr ""
 
@@ -678,64 +678,64 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -745,16 +745,16 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -927,25 +927,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr ""
 
@@ -979,17 +979,17 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "裝備"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: 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
 msgid "Unequip"
 msgstr "卸下裝備"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "說明"
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "物品攔"
@@ -1026,20 +1026,20 @@ msgstr "欄位:"
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: 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
 msgid "Equip"
 msgstr "裝備"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: 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/skilldialog.cpp:242
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: 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
 msgid "Drop..."
@@ -1050,7 +1050,7 @@ msgstr ""
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr ""
@@ -1059,7 +1059,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "重量:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: 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
 msgid "Store"
@@ -1069,9 +1069,9 @@ msgstr "寄放"
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "丟棄"
 
@@ -1120,7 +1120,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr ""
 
@@ -1328,22 +1328,22 @@ msgstr "傳送"
 msgid "Failed to send as sender or letter invalid."
 msgstr "無法傳送的發件人或信息無效。"
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr ""
 
@@ -1552,7 +1552,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr ""
 
@@ -1879,103 +1879,111 @@ msgstr ""
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "顏色"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "將所有的悄悄話放到分頁中"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2234,35 +2242,43 @@ msgstr ""
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr ""
 
@@ -2754,7 +2770,7 @@ msgstr "要求交易"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "技能"
 
@@ -2893,7 +2909,7 @@ msgstr "建立公會"
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr ""
 
@@ -3001,7 +3017,7 @@ msgstr ""
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr ""
 
@@ -3382,7 +3398,7 @@ msgstr ""
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3558,83 +3574,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "狀態"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr ""
 
@@ -3658,447 +3674,435 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: 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
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "表情捷徑鍵 %d"
+
+#: 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
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "物品捷徑鍵 %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr ""
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr ""
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "上移"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "下移"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "左移"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "右移"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "尋找目標攻擊"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "停止攻擊"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "以 NPC 為目標"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "以玩家為目標"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "撿拾"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "隱藏視窗"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "螢幕快照"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "啟用/停用交易"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "選擇確定"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "物品捷徑鍵 %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "說明視窗"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "狀態視窗"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "物品欄視窗"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "物品視窗"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "迷你地圖視窗"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "聊天視窗"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "物品捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "設定視窗"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "程式除錯視窗"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "表情捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "史萊姆吃掉妳了~~"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "表情捷徑鍵 %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "切換聊天"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "將聊天向上捲動"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "將聊天向下捲動"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "前一個聊天分頁"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "下一個聊天分頁"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "忽略輸入 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "忽略輸入 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"