Merge branch 'master' into stable

1 files changed, 379 insertions, 557 deletions

diff --git a/po/th.po b/po/th.po
index 33b025eb6..6e3c4bf9a 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-13 12:04+0300\n"
+"PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:872
+#: src/actionmanager.cpp:875
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:882
+#: src/actionmanager.cpp:885
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1251
+#: src/actormanager.cpp:1268
 msgid "Visible on map"
 msgstr ""
 
@@ -57,436 +57,436 @@ msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:388
+#: src/being/localplayer.cpp:391
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1373
+#: src/being/localplayer.cpp:1376
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:1380
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:1384
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:1388
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:1392
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:1396
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:1400
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1421
+#: src/being/localplayer.cpp:1424
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1626 src/being/localplayer.cpp:1661
-#: src/being/localplayer.cpp:1662
+#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
+#: src/being/localplayer.cpp:1665
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1667 src/being/localplayer.cpp:1674
-#: src/being/localplayer.cpp:1681
+#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
+#: src/being/localplayer.cpp:1684
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1867
+#: src/being/localplayer.cpp:1870
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1869
+#: src/being/localplayer.cpp:1872
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1874
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1876
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1878
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1880
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1900
+#: src/being/localplayer.cpp:1903
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1906
+#: src/being/localplayer.cpp:1909
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1911
+#: src/being/localplayer.cpp:1914
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1926
+#: src/being/localplayer.cpp:1929
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1928
+#: src/being/localplayer.cpp:1931
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1933
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1935
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1937
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1939
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1941
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1943
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1945
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1947
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1964
+#: src/being/localplayer.cpp:1967
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1966
+#: src/being/localplayer.cpp:1969
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1971
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1973
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1975
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1992 src/being/localplayer.cpp:2000
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
+#: src/being/localplayer.cpp:2031
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1994 src/being/localplayer.cpp:2020
+#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1996
+#: src/being/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1998
+#: src/being/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2022
+#: src/being/localplayer.cpp:2025
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:2029
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2080
+#: src/being/localplayer.cpp:2083
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2082
+#: src/being/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:2089
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:2091
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:2093
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:2095
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:2097
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2108
+#: src/being/localplayer.cpp:2111
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2110
+#: src/being/localplayer.cpp:2113
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:2115
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:2117
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:2119
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:2121
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2138
+#: src/being/localplayer.cpp:2141
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2140
+#: src/being/localplayer.cpp:2143
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:2145
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:2147
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:2149
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:2151
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2168
+#: src/being/localplayer.cpp:2171
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2170
+#: src/being/localplayer.cpp:2173
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:2175
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:2177
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:2179
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2196
+#: src/being/localplayer.cpp:2199
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2198
+#: src/being/localplayer.cpp:2201
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:2203
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2229
+#: src/being/localplayer.cpp:2232
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2252
+#: src/being/localplayer.cpp:2255
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2254
+#: src/being/localplayer.cpp:2257
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2256 src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2270
+#: src/being/localplayer.cpp:2273
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2272
+#: src/being/localplayer.cpp:2275
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2299
+#: src/being/localplayer.cpp:2302
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2301
+#: src/being/localplayer.cpp:2304
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:2306
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3862
+#: src/being/localplayer.cpp:3887
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3868 src/being/localplayer.cpp:3893
+#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3878
+#: src/being/localplayer.cpp:3903
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3884 src/being/localplayer.cpp:3898
+#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4241
+#: src/being/localplayer.cpp:4266
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -524,7 +524,8 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
+#: src/gui/windows/setupwindow.cpp:59
 msgid "Setup"
 msgstr "ตั้งค่า"
 
@@ -536,7 +537,7 @@ msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
 msgid "Video"
 msgstr ""
 
@@ -659,7 +660,7 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -681,7 +682,7 @@ msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2998
+#: src/client.cpp:3000
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -738,7 +739,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:78
 msgid "Party name is missing."
 msgstr ""
 
@@ -886,25 +887,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1340
+#: src/commands.cpp:1342
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1347
+#: src/commands.cpp:1349
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1354
+#: src/commands.cpp:1356
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1474 src/commands.cpp:1483
+#: src/commands.cpp:1476 src/commands.cpp:1485
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1477 src/commands.cpp:1486
+#: src/commands.cpp:1479 src/commands.cpp:1488
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -927,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
 #: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
 msgid "Network Error"
 msgstr ""
 
@@ -1070,7 +1071,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
 #: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
 #: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1182,7 +1183,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
 #: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1191,7 +1192,7 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
 #: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:92
+#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
@@ -1264,7 +1265,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1334,7 +1335,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
 msgid "Leave"
 msgstr ""
 
@@ -1416,7 +1417,7 @@ msgstr ""
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
 #: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1481,7 +1482,7 @@ msgstr ""
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
 #: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "ใช้"
 
@@ -1672,9 +1673,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
 #: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
 msgid "Unequip"
 msgstr ""
 
@@ -1683,7 +1684,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
@@ -1691,7 +1692,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
 msgid "Drop..."
 msgstr ""
 
@@ -1706,7 +1707,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
 msgid "Drop"
 msgstr "ทิ้ง"
 
@@ -1795,7 +1796,7 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
@@ -1850,11 +1851,16 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:165
-msgid "Change Map View Mode"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:171
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:177
 msgid "Select OK"
 msgstr ""
 
@@ -1864,7 +1870,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:177 src/gui/windows/buydialog.cpp:275
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
 #: src/gui/windows/serverdialog.cpp:254
@@ -1872,491 +1878,504 @@ msgid "Quit"
 msgstr "ออก"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:183
+#: src/gui/setupactiondata.h:189
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:189
+#: src/gui/setupactiondata.h:195
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:204
+#: src/gui/setupactiondata.h:210
 msgid "Shortcuts modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:210
+#: src/gui/setupactiondata.h:216
 msgid "Item Shortcuts Key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:216
+#: src/gui/setupactiondata.h:222
 msgid "Shortcuts keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:222 src/gui/setupactiondata.h:228
-#: src/gui/setupactiondata.h:234 src/gui/setupactiondata.h:240
-#: src/gui/setupactiondata.h:246 src/gui/setupactiondata.h:252
-#: src/gui/setupactiondata.h:258 src/gui/setupactiondata.h:264
-#: src/gui/setupactiondata.h:270 src/gui/setupactiondata.h:276
-#: src/gui/setupactiondata.h:282 src/gui/setupactiondata.h:288
-#: src/gui/setupactiondata.h:294 src/gui/setupactiondata.h:300
-#: src/gui/setupactiondata.h:306 src/gui/setupactiondata.h:312
-#: src/gui/setupactiondata.h:318 src/gui/setupactiondata.h:324
-#: src/gui/setupactiondata.h:330 src/gui/setupactiondata.h:336
+#: src/gui/setupactiondata.h:228 src/gui/setupactiondata.h:234
+#: src/gui/setupactiondata.h:240 src/gui/setupactiondata.h:246
+#: src/gui/setupactiondata.h:252 src/gui/setupactiondata.h:258
+#: src/gui/setupactiondata.h:264 src/gui/setupactiondata.h:270
+#: src/gui/setupactiondata.h:276 src/gui/setupactiondata.h:282
+#: src/gui/setupactiondata.h:288 src/gui/setupactiondata.h:294
+#: src/gui/setupactiondata.h:300 src/gui/setupactiondata.h:306
+#: src/gui/setupactiondata.h:312 src/gui/setupactiondata.h:318
+#: src/gui/setupactiondata.h:324 src/gui/setupactiondata.h:330
+#: src/gui/setupactiondata.h:336 src/gui/setupactiondata.h:342
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:351
+#: src/gui/setupactiondata.h:357
 msgid "Show Windows Menu"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:357
+#: src/gui/setupactiondata.h:363
 msgid "Hide Windows"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:363
+#: src/gui/setupactiondata.h:369
 msgid "Help Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:369
+#: src/gui/setupactiondata.h:375
 msgid "Status Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:375
+#: src/gui/setupactiondata.h:381
 msgid "Inventory Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:381
+#: src/gui/setupactiondata.h:387
 msgid "Equipment Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:387
+#: src/gui/setupactiondata.h:393
 msgid "Skill Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:393
+#: src/gui/setupactiondata.h:399
 msgid "Minimap Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:399
+#: src/gui/setupactiondata.h:405
 msgid "Chat Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:405
+#: src/gui/setupactiondata.h:411
 msgid "Item Shortcut Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:411
+#: src/gui/setupactiondata.h:417
 msgid "Setup Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:417
+#: src/gui/setupactiondata.h:423
 msgid "Debug Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:423
+#: src/gui/setupactiondata.h:429
 msgid "Social Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:429
+#: src/gui/setupactiondata.h:435
 msgid "Emote Shortcut Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:435
+#: src/gui/setupactiondata.h:441
 msgid "Outfits Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:441
+#: src/gui/setupactiondata.h:447
 msgid "Shop Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:447
+#: src/gui/setupactiondata.h:453
 msgid "Quick drop Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:453
+#: src/gui/setupactiondata.h:459
 msgid "Kill Stats Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:459
+#: src/gui/setupactiondata.h:465
 msgid "Commands Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:465
+#: src/gui/setupactiondata.h:471
 msgid "Bot Checker Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:471
+#: src/gui/setupactiondata.h:477
 msgid "Who Is Online Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:477
+#: src/gui/setupactiondata.h:483
 msgid "Did you know Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:483
+#: src/gui/setupactiondata.h:489
 msgid "Quests Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:489
+#: src/gui/setupactiondata.h:495
 msgid "Previous Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:495
+#: src/gui/setupactiondata.h:501
 msgid "Next Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:507
+msgid "Previous Shortcuts tab"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+msgid "Next Shortcuts tab"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+msgid "Previous Commands tab"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:525
+msgid "Next Commands tab"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:546
 msgid "Emote modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:552
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:528 src/gui/setupactiondata.h:534
-#: src/gui/setupactiondata.h:540 src/gui/setupactiondata.h:546
-#: src/gui/setupactiondata.h:552 src/gui/setupactiondata.h:558
-#: src/gui/setupactiondata.h:564 src/gui/setupactiondata.h:570
-#: src/gui/setupactiondata.h:576 src/gui/setupactiondata.h:582
-#: src/gui/setupactiondata.h:588 src/gui/setupactiondata.h:594
-#: src/gui/setupactiondata.h:600 src/gui/setupactiondata.h:606
-#: src/gui/setupactiondata.h:612 src/gui/setupactiondata.h:618
-#: src/gui/setupactiondata.h:624 src/gui/setupactiondata.h:630
-#: src/gui/setupactiondata.h:636 src/gui/setupactiondata.h:642
-#: src/gui/setupactiondata.h:648 src/gui/setupactiondata.h:654
-#: src/gui/setupactiondata.h:660 src/gui/setupactiondata.h:666
-#: src/gui/setupactiondata.h:672 src/gui/setupactiondata.h:678
-#: src/gui/setupactiondata.h:684 src/gui/setupactiondata.h:690
-#: src/gui/setupactiondata.h:696 src/gui/setupactiondata.h:702
-#: src/gui/setupactiondata.h:708 src/gui/setupactiondata.h:714
-#: src/gui/setupactiondata.h:720 src/gui/setupactiondata.h:726
-#: src/gui/setupactiondata.h:732 src/gui/setupactiondata.h:738
-#: src/gui/setupactiondata.h:744 src/gui/setupactiondata.h:750
-#: src/gui/setupactiondata.h:756 src/gui/setupactiondata.h:762
-#: src/gui/setupactiondata.h:768 src/gui/setupactiondata.h:774
-#: src/gui/setupactiondata.h:780 src/gui/setupactiondata.h:786
-#: src/gui/setupactiondata.h:792 src/gui/setupactiondata.h:798
-#: src/gui/setupactiondata.h:804 src/gui/setupactiondata.h:810
+#: src/gui/setupactiondata.h:558 src/gui/setupactiondata.h:564
+#: src/gui/setupactiondata.h:570 src/gui/setupactiondata.h:576
+#: src/gui/setupactiondata.h:582 src/gui/setupactiondata.h:588
+#: src/gui/setupactiondata.h:594 src/gui/setupactiondata.h:600
+#: src/gui/setupactiondata.h:606 src/gui/setupactiondata.h:612
+#: src/gui/setupactiondata.h:618 src/gui/setupactiondata.h:624
+#: src/gui/setupactiondata.h:630 src/gui/setupactiondata.h:636
+#: src/gui/setupactiondata.h:642 src/gui/setupactiondata.h:648
+#: src/gui/setupactiondata.h:654 src/gui/setupactiondata.h:660
+#: src/gui/setupactiondata.h:666 src/gui/setupactiondata.h:672
+#: src/gui/setupactiondata.h:678 src/gui/setupactiondata.h:684
+#: src/gui/setupactiondata.h:690 src/gui/setupactiondata.h:696
+#: src/gui/setupactiondata.h:702 src/gui/setupactiondata.h:708
+#: src/gui/setupactiondata.h:714 src/gui/setupactiondata.h:720
+#: src/gui/setupactiondata.h:726 src/gui/setupactiondata.h:732
+#: src/gui/setupactiondata.h:738 src/gui/setupactiondata.h:744
+#: src/gui/setupactiondata.h:750 src/gui/setupactiondata.h:756
+#: src/gui/setupactiondata.h:762 src/gui/setupactiondata.h:768
+#: src/gui/setupactiondata.h:774 src/gui/setupactiondata.h:780
+#: src/gui/setupactiondata.h:786 src/gui/setupactiondata.h:792
+#: src/gui/setupactiondata.h:798 src/gui/setupactiondata.h:804
+#: src/gui/setupactiondata.h:810 src/gui/setupactiondata.h:816
+#: src/gui/setupactiondata.h:822 src/gui/setupactiondata.h:828
+#: src/gui/setupactiondata.h:834 src/gui/setupactiondata.h:840
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:855
 msgid "Outfits keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:861
 msgid "Wear Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:867
 msgid "Copy Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:873
 msgid "Copy equipped to Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:879
 msgid "Outfits shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:855 src/gui/setupactiondata.h:861
-#: src/gui/setupactiondata.h:867 src/gui/setupactiondata.h:873
-#: src/gui/setupactiondata.h:879 src/gui/setupactiondata.h:885
-#: src/gui/setupactiondata.h:891 src/gui/setupactiondata.h:897
-#: src/gui/setupactiondata.h:903 src/gui/setupactiondata.h:909
-#: src/gui/setupactiondata.h:915 src/gui/setupactiondata.h:921
-#: src/gui/setupactiondata.h:927 src/gui/setupactiondata.h:933
-#: src/gui/setupactiondata.h:939 src/gui/setupactiondata.h:945
-#: src/gui/setupactiondata.h:951 src/gui/setupactiondata.h:957
-#: src/gui/setupactiondata.h:963 src/gui/setupactiondata.h:969
-#: src/gui/setupactiondata.h:975 src/gui/setupactiondata.h:981
-#: src/gui/setupactiondata.h:987 src/gui/setupactiondata.h:993
-#: src/gui/setupactiondata.h:999 src/gui/setupactiondata.h:1005
-#: src/gui/setupactiondata.h:1011 src/gui/setupactiondata.h:1017
-#: src/gui/setupactiondata.h:1023 src/gui/setupactiondata.h:1029
-#: src/gui/setupactiondata.h:1035 src/gui/setupactiondata.h:1041
-#: src/gui/setupactiondata.h:1047 src/gui/setupactiondata.h:1053
-#: src/gui/setupactiondata.h:1059 src/gui/setupactiondata.h:1065
-#: src/gui/setupactiondata.h:1071 src/gui/setupactiondata.h:1077
-#: src/gui/setupactiondata.h:1083 src/gui/setupactiondata.h:1089
-#: src/gui/setupactiondata.h:1095 src/gui/setupactiondata.h:1101
-#: src/gui/setupactiondata.h:1107 src/gui/setupactiondata.h:1113
-#: src/gui/setupactiondata.h:1119 src/gui/setupactiondata.h:1125
-#: src/gui/setupactiondata.h:1131 src/gui/setupactiondata.h:1137
+#: src/gui/setupactiondata.h:885 src/gui/setupactiondata.h:891
+#: src/gui/setupactiondata.h:897 src/gui/setupactiondata.h:903
+#: src/gui/setupactiondata.h:909 src/gui/setupactiondata.h:915
+#: src/gui/setupactiondata.h:921 src/gui/setupactiondata.h:927
+#: src/gui/setupactiondata.h:933 src/gui/setupactiondata.h:939
+#: src/gui/setupactiondata.h:945 src/gui/setupactiondata.h:951
+#: src/gui/setupactiondata.h:957 src/gui/setupactiondata.h:963
+#: src/gui/setupactiondata.h:969 src/gui/setupactiondata.h:975
+#: src/gui/setupactiondata.h:981 src/gui/setupactiondata.h:987
+#: src/gui/setupactiondata.h:993 src/gui/setupactiondata.h:999
+#: src/gui/setupactiondata.h:1005 src/gui/setupactiondata.h:1011
+#: src/gui/setupactiondata.h:1017 src/gui/setupactiondata.h:1023
+#: src/gui/setupactiondata.h:1029 src/gui/setupactiondata.h:1035
+#: src/gui/setupactiondata.h:1041 src/gui/setupactiondata.h:1047
+#: src/gui/setupactiondata.h:1053 src/gui/setupactiondata.h:1059
+#: src/gui/setupactiondata.h:1065 src/gui/setupactiondata.h:1071
+#: src/gui/setupactiondata.h:1077 src/gui/setupactiondata.h:1083
+#: src/gui/setupactiondata.h:1089 src/gui/setupactiondata.h:1095
+#: src/gui/setupactiondata.h:1101 src/gui/setupactiondata.h:1107
+#: src/gui/setupactiondata.h:1113 src/gui/setupactiondata.h:1119
+#: src/gui/setupactiondata.h:1125 src/gui/setupactiondata.h:1131
+#: src/gui/setupactiondata.h:1137 src/gui/setupactiondata.h:1143
+#: src/gui/setupactiondata.h:1149 src/gui/setupactiondata.h:1155
+#: src/gui/setupactiondata.h:1161 src/gui/setupactiondata.h:1167
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1182
 msgid "Toggle Chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1194
 msgid "Scroll Chat Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1200
 msgid "Previous Chat Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1206
 msgid "Next Chat Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1212
 msgid "Close current Chat Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1218
 msgid "Previous chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1224
 msgid "Next chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1230
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1251
 msgid "Ignore input 2"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1275
 msgid "Direct Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1281
 msgid "Crazy moves"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1287
 msgid "Change Crazy Move mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1299
 msgid "Quick Drop N Items"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1305
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1311
 msgid "Quick heal target or self"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1317
 msgid "Use #itenplz spell"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1323
 msgid "Use magic attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1329
 msgid "Switch magic attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1335
 msgid "Switch pvp attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1341
 msgid "Change move type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Weapon Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1353
 msgid "Change Attack Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1359
 msgid "Change Follow mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1365
 msgid "Change Imitation mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1371
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1377
 msgid "On / Off audio"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1383
 msgid "Enable / Disable away mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1389
 msgid "Emulate right click from keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1395
 msgid "Toggle camera mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
+#: src/gui/setupactiondata.h:1401
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1416
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1422 src/gui/setupactiondata.h:1761
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1767
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1773
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1779
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1452
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
 #: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
 #: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
 #: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
@@ -2379,32 +2398,34 @@ msgstr ""
 #: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
 #: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
 #: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1722 src/gui/setupactiondata.h:1728
+#: src/gui/setupactiondata.h:1734 src/gui/setupactiondata.h:1740
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1755
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1803
 msgid "Page down"
 msgstr ""
 
@@ -2413,7 +2434,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2424,12 +2445,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1821
 msgid "Select2"
 msgstr ""
 
@@ -2439,7 +2460,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:106
 #: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
@@ -2448,45 +2469,45 @@ msgid "Delete"
 msgstr "ลบทิ้ง"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1863
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1940
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2494,7 +2515,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2502,13 +2523,13 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1956
 msgid "Gui"
 msgstr ""
 
@@ -2726,7 +2747,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/windows/inventorywindow.cpp:600
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2839,13 +2860,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:544
+#: src/gui/widgets/tabs/chattab.cpp:537
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:549
+#: src/gui/widgets/tabs/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2864,68 +2885,6 @@ msgstr ""
 msgid "Guild"
 msgstr ""
 
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#. TRANSLATORS: party help message
-#: src/gui/widgets/tabs/guildchattab.cpp:63 src/net/ea/gui/guildtab.cpp:71
-#: src/net/ea/gui/partytab.cpp:97
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:65 src/net/ea/gui/guildtab.cpp:73
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#. TRANSLATORS: party help message
-#: src/gui/widgets/tabs/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
-#: src/net/ea/gui/partytab.cpp:101
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#. TRANSLATORS: party help message
-#: src/gui/widgets/tabs/guildchattab.cpp:73 src/net/ea/gui/guildtab.cpp:81
-#: src/net/ea/gui/partytab.cpp:107
-msgid "Command: /leave"
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:75 src/net/ea/gui/guildtab.cpp:83
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#. TRANSLATORS: party help message
-#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:144
-#: src/net/ea/gui/partytab.cpp:76
-msgid "/help > Display this help."
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
-msgid "/kick > Kick someone from the guild you are in"
-msgstr ""
-
 #. TRANSLATORS: lang chat tab name
 #: src/gui/widgets/tabs/langtab.cpp:31
 msgid "Lang"
@@ -4369,8 +4328,8 @@ msgstr ""
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:495
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -4457,106 +4416,106 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
 msgid "Full screen"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
 msgid "FPS limit:"
 msgstr ""
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:425
-#: src/gui/widgets/tabs/setup_video.cpp:553
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
 msgid "Alt FPS limit: "
 msgstr ""
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
 msgid "Custom cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
 #: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:423
-#: src/gui/widgets/tabs/setup_video.cpp:537
-#: src/gui/widgets/tabs/setup_video.cpp:550
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:345
+#: src/gui/widgets/tabs/setup_video.cpp:349
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:352
+#: src/gui/widgets/tabs/setup_video.cpp:356
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:368
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:370
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:384
+#: src/gui/widgets/tabs/setup_video.cpp:388
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:386
+#: src/gui/widgets/tabs/setup_video.cpp:390
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:468
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:470
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_video.cpp:496
+#: src/gui/widgets/tabs/setup_video.cpp:500
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -4614,13 +4573,10 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_visual.cpp:103
+#: src/gui/widgets/tabs/setup_visual.cpp:111
 msgid "Scale"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:110
-msgid "Scale "
-msgstr ""
-
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_visual.cpp:115
 msgid "Notifications"
@@ -4707,52 +4663,6 @@ msgstr ""
 msgid "Allow screensaver to run"
 msgstr ""
 
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
-msgid "/ignore > Ignore the other player"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
-msgid "/close > Close the whisper tab"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
-msgid "Command: /close"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
-msgid "This command closes the current whisper tab."
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
-msgid "Command: /ignore"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
-msgid "This command ignores the other player regardless of current relations."
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
-msgid "Command: /unignore <player>"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr ""
-
 #. TRANSLATORS: short button name for who is online window.
 #: src/gui/windowmenu.cpp:68
 msgid "ONL"
@@ -4821,7 +4731,7 @@ msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
 #: src/gui/windows/inventorywindow.cpp:228
 msgid "Equipment"
 msgstr ""
@@ -5034,7 +4944,7 @@ msgstr ""
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
 #: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1299
+#: src/gui/windows/socialwindow.cpp:1300
 msgid "Create"
 msgstr "สร้าง"
 
@@ -6106,12 +6016,12 @@ msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr ""
 
@@ -6327,131 +6237,131 @@ msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1717
+#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1290
+#: src/gui/windows/socialwindow.cpp:1291
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1295
+#: src/gui/windows/socialwindow.cpp:1296
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/socialwindow.cpp:1302
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1637
+#: src/gui/windows/socialwindow.cpp:1640
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1672
+#: src/gui/windows/socialwindow.cpp:1675
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1677
+#: src/gui/windows/socialwindow.cpp:1680
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1686
+#: src/gui/windows/socialwindow.cpp:1689
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1692
+#: src/gui/windows/socialwindow.cpp:1695
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr ""
 
@@ -7060,137 +6970,49 @@ msgstr ""
 msgid "Guild castle: %s"
 msgstr ""
 
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
-msgid "/invite > Invite a player to your party"
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
-msgid "/leave > Leave the party you are in"
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
-msgid "/kick > Kick someone from the party you are in"
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
-msgid "/item > Show/change party item sharing options"
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
-msgid "/exp > Show/change party experience sharing options"
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
-msgid "This command invites <nick> to party with you."
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
-msgid "This command causes the player to leave the party."
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
-msgid "Command: /item <policy>"
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:117
-msgid "This command changes the party's item sharing policy."
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
-msgid "Command: /item"
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
-msgid "This command displays the party's current item sharing policy."
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
-msgid "Command: /exp <policy>"
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
-msgid "This command changes the party's experience sharing policy."
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
-msgid "Command: /exp"
-msgstr ""
-
-#. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
-
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:105 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:109 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:113 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:117
 msgid "Item sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:149 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:153 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:157 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:161
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7941,7 +7763,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""