update translations.

author: Andrei Karas <akaras@inbox.ru> 2014-02-04 23:03:38 +0300
committer: Andrei Karas <akaras@inbox.ru> 2014-02-04 23:03:38 +0300
commit: 0b67538b1d403a14f4754aaa7fe3aabc098abe41 (patch)
tree: 3a3bd26cb4305c728f843538fd44b72d3314f6a0 /po
parent: 8ad2fe11ef255b3443eb8b98d3eb40a54b04cbb4 (diff)
download: manaplus-0b67538b1d403a14f4754aaa7fe3aabc098abe41.tar.gz
manaplus-0b67538b1d403a14f4754aaa7fe3aabc098abe41.tar.bz2
manaplus-0b67538b1d403a14f4754aaa7fe3aabc098abe41.tar.xz
manaplus-0b67538b1d403a14f4754aaa7fe3aabc098abe41.zip
41 files changed, 5622 insertions, 5426 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 29eba8978..0a4d111ec 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -76,7 +76,7 @@ src/gui/windows/quitdialog.cpp
 src/gui/windows/registerdialog.cpp
 src/gui/windows/selldialog.cpp
 src/gui/windows/serverdialog.cpp
-src/gui/windows/setup.cpp
+src/gui/windows/setupwindow.cpp
 src/gui/windows/shopwindow.cpp
 src/gui/windows/skilldialog.cpp
 src/gui/windows/socialwindow.cpp
diff --git a/po/ar.po b/po/ar.po
index ba9ea0923..c1e7a1276 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -541,7 +541,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 "مرئية"
 
@@ -664,7 +664,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 ""
@@ -686,7 +686,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 ""
 
@@ -891,25 +891,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 ""
 
@@ -945,23 +945,23 @@ 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 ""
 
@@ -1075,7 +1075,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1187,7 +1187,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1269,7 +1269,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1421,7 +1421,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1486,7 +1486,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 "استخدام"
 
@@ -1677,9 +1677,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 "تجريد من العتاد"
 
@@ -1688,7 +1688,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 "استعمال العتاد"
 
@@ -1696,7 +1696,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 ""
 
@@ -1711,7 +1711,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 "إسقاط"
 
@@ -1800,7 +1800,7 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
@@ -2316,100 +2316,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2418,7 +2413,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2429,12 +2424,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2444,7 +2439,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:1803 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
@@ -2453,45 +2448,45 @@ msgid "Delete"
 msgstr "حذف"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2499,7 +2494,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2507,13 +2502,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2731,7 +2726,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
@@ -4374,8 +4369,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 ""
 
@@ -4462,106 +4457,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 "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
 #. 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 ""
 
@@ -4826,7 +4821,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 "العتاد"
diff --git a/po/bg.po b/po/bg.po
index 77ee39ecc..011d74df3 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -537,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 ""
 
@@ -660,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 ""
@@ -682,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 ""
 
@@ -887,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 ""
 
@@ -941,23 +941,23 @@ 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 ""
 
@@ -1071,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1183,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1265,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1417,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1482,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 ""
 
@@ -1673,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 ""
 
@@ -1684,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 ""
 
@@ -1692,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 ""
 
@@ -1707,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 ""
 
@@ -1796,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
@@ -2312,100 +2312,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2409,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2420,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2435,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:1803 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
@@ -2449,45 +2444,45 @@ msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2490,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2498,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2727,7 +2722,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
@@ -4370,8 +4365,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 ""
 
@@ -4458,106 +4453,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 ""
 
@@ -4822,7 +4817,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 ""
diff --git a/po/ca.po b/po/ca.po
index 7a1b5501a..c0cb70754 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,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-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -538,7 +538,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 "Vídeo "
 
@@ -661,7 +661,7 @@ msgstr "Adéu, torna quan vulguis... "
 
 #. 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 "%s no existeix i no pot ser creat! Sortint."
@@ -683,7 +683,7 @@ msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s no existeix i no pot ser creat! Sortint."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2998
+#: src/client.cpp:3000
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -888,25 +888,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 ""
 
@@ -942,23 +942,23 @@ msgid "Debug"
 msgstr "Depurador "
 
 #. 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 "Error al guardar la captura de pantalla! "
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
 msgid "The connection to the server was lost."
 msgstr "S'ha perdut la connexió amb el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
 msgid "Network Error"
 msgstr "Error de xarxa "
 
@@ -998,7 +998,7 @@ msgstr "Pes: %s"
 #: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
-msgstr ""
+msgstr "Intercanvi "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade attack player
@@ -1072,7 +1072,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Moure"
 
@@ -1184,7 +1184,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1266,7 +1266,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1282,7 +1282,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
 msgid "Spells"
-msgstr "Encanteris"
+msgstr "Conjurs "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
@@ -1418,7 +1418,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/setup.cpp:94
 msgid "Store"
 msgstr "Botiga "
 
@@ -1483,7 +1483,7 @@ msgstr "Recupera-ho tot"
 #. 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 "Utilitzar "
 
@@ -1674,9 +1674,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 "Des-equipar "
 
@@ -1685,7 +1685,7 @@ msgstr "Des-equipar "
 #. 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 "Equipar "
 
@@ -1693,7 +1693,7 @@ msgstr "Equipar "
 #. 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 "Deixar caure... "
 
@@ -1708,7 +1708,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 "Deixar caure "
 
@@ -1768,12 +1768,12 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:57
 msgid "Target & Attack"
-msgstr ""
+msgstr "Enfoca i Ataca"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:63
 msgid "Move to Target"
-msgstr ""
+msgstr "Mou-te al Objectiu "
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:69
@@ -1797,7 +1797,7 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
@@ -2313,100 +2313,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
-msgstr ""
+msgstr "Mou Amunt "
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
-msgstr ""
+msgstr "Mou Abaix "
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
-msgstr ""
+msgstr "Mou Esquerra "
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
-msgstr ""
+msgstr "Mou Dreta "
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2415,7 +2410,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2426,12 +2421,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2441,7 +2436,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:1803 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
@@ -2450,45 +2445,45 @@ msgid "Delete"
 msgstr "Esborra "
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
-msgstr ""
+msgstr "Dreceres "
 
 #. 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2496,7 +2491,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2504,20 +2499,20 @@ 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:1922 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Xat "
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
 msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:111
 msgid "Being"
-msgstr ""
+msgstr "Ser"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:113
@@ -2557,23 +2552,23 @@ msgstr ""
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:127
 msgid "NPCs"
-msgstr ""
+msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
 msgid "Monsters"
-msgstr ""
+msgstr "Monstres "
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:131
 msgid "Monster HP bar"
-msgstr ""
+msgstr "Barra de vida de monstres "
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:134
 msgid "Monster HP bar (second color)"
-msgstr ""
+msgstr "Barra de vida de monstres (segon color)  "
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:136
@@ -2604,12 +2599,12 @@ msgstr ""
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:146
 msgid "Player HP bar"
-msgstr ""
+msgstr "Barra de vida del Jugador "
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:150
 msgid "Player HP bar (second color)"
-msgstr ""
+msgstr "Barra de vida del Jugador  (segon color) "
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:152
@@ -2629,7 +2624,7 @@ msgstr ""
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:160
 msgid "Critical Hit"
-msgstr ""
+msgstr "Cop Crític "
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:164
@@ -2649,7 +2644,7 @@ msgstr ""
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:172
 msgid "Misses"
-msgstr ""
+msgstr "Cops fallats"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:174
@@ -2728,7 +2723,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
@@ -2821,24 +2816,24 @@ msgstr "Nivell: %d"
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:34
 msgid "Battle"
-msgstr ""
+msgstr "Batalla "
 
 #. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/chattab.cpp:154
 msgid "Global announcement:"
-msgstr ""
+msgstr "Anunci global:"
 
 #. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/chattab.cpp:160
 #, c-format
 msgid "Global announcement from %s:"
-msgstr ""
+msgstr "Anunci global de %s:"
 
 #. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/chattab.cpp:186
 #, c-format
 msgid "%s whispers: %s"
-msgstr ""
+msgstr "%s xiuxiueigs: %s"
 
 #. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/chattab.cpp:544
@@ -4371,8 +4366,8 @@ msgstr "Tema canviat "
 
 #. 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 "Reinicia el client per que els canvis tinguin efecte."
 
@@ -4459,106 +4454,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 "Pantalla completa"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
 msgid "FPS limit:"
 msgstr "Límit d'FPS "
 
 #. 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 "Límit d'FPS alternatiu: "
 
 #. 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 "Ratolí personalitzat "
 
 #. 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 "Res"
 
 #. 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 "Error al canviar al mode finestra, la restauració al mode anterior també ha fallat! "
 
 #. 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 "Error al canviar al mode pantalla completa, la restauració al mode anterior també ha fallat! "
 
 #. 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 "Canviant a pantalla completa "
 
 #. 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 "Reinici requerit per que els canvis tinguin efecte."
 
 #. 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 "Canviant a OpenGL"
 
 #. 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 "Aplicar un canvi a OpenGL requereix reinici. "
 
 #. 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 "Resolució personalitzada (exemple: 1024x768) "
 
 #. 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 "Entra nova resolució: "
 
 #. 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 "La resolució de la pantalla ha canviat "
 
-#: 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 "Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa. "
 
@@ -4712,37 +4707,37 @@ msgstr ""
 #. TRANSLATORS: whisper tab help
 #: src/gui/widgets/tabs/whispertab.cpp:98
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > Ignorar un altre jugador"
 
 #. TRANSLATORS: whisper tab help
 #: src/gui/widgets/tabs/whispertab.cpp:100
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > Deixa d'ignorar un altre jugador "
 
 #. TRANSLATORS: whisper tab help
 #: src/gui/widgets/tabs/whispertab.cpp:102
 msgid "/close > Close the whisper tab"
-msgstr ""
+msgstr "/close > Tanca la finestra de xiuxiueig "
 
 #. TRANSLATORS: whisper tab help
 #: src/gui/widgets/tabs/whispertab.cpp:113
 msgid "Command: /close"
-msgstr ""
+msgstr "Ordre: /close "
 
 #. TRANSLATORS: whisper tab help
 #: src/gui/widgets/tabs/whispertab.cpp:115
 msgid "This command closes the current whisper tab."
-msgstr ""
+msgstr "Aquesta ordre tanca la finestra de xiuxiueig actual. "
 
 #. TRANSLATORS: whisper tab help
 #: src/gui/widgets/tabs/whispertab.cpp:120
 msgid "Command: /ignore"
-msgstr ""
+msgstr "Ordre: /ignore "
 
 #. TRANSLATORS: whisper tab help
 #: src/gui/widgets/tabs/whispertab.cpp:122
 msgid "This command ignores the other player regardless of current relations."
-msgstr ""
+msgstr "Aquesta ordre ignora un altre jugador independentment de la relació. "
 
 #. TRANSLATORS: whisper tab help
 #: src/gui/widgets/tabs/whispertab.cpp:128
@@ -4753,16 +4748,16 @@ msgstr "Comandament: /unignore <jugador> "
 #: src/gui/widgets/tabs/whispertab.cpp:130
 msgid ""
 "This command stops ignoring the other player if they are being ignored."
-msgstr ""
+msgstr "Aquesta ordre deixa d'ignorar un jugador si estava sent ignorat. "
 
 #. TRANSLATORS: short button name for who is online window.
 #: src/gui/windowmenu.cpp:68
 msgid "ONL"
-msgstr ""
+msgstr "ONL"
 
 #: src/gui/windowmenu.cpp:69
 msgid "Who is online"
-msgstr ""
+msgstr "Qui està en línia "
 
 #. TRANSLATORS: short button name for help window.
 #: src/gui/windowmenu.cpp:71
@@ -4782,16 +4777,16 @@ msgstr ""
 #. TRANSLATORS: short button name for bot checker window.
 #: src/gui/windowmenu.cpp:77
 msgid "BC"
-msgstr ""
+msgstr "BC"
 
 #: src/gui/windowmenu.cpp:78
 msgid "Bot checker"
-msgstr ""
+msgstr "Comprovador de Bot "
 
 #. TRANSLATORS: short button name for kill stats window.
 #: src/gui/windowmenu.cpp:80
 msgid "KS"
-msgstr ""
+msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
 #: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
@@ -4810,20 +4805,20 @@ msgstr ""
 #. TRANSLATORS: short button name for status window.
 #: src/gui/windowmenu.cpp:93
 msgid "STA"
-msgstr ""
+msgstr "EST"
 
 #: src/gui/windowmenu.cpp:94
 msgid "Status"
-msgstr ""
+msgstr "Estat "
 
 #. TRANSLATORS: short button name for equipment window.
 #: src/gui/windowmenu.cpp:96
 msgid "EQU"
-msgstr ""
+msgstr "EQU"
 
 #. 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 "Equipament "
@@ -4831,7 +4826,7 @@ msgstr "Equipament "
 #. TRANSLATORS: short button name for inventory window.
 #: src/gui/windowmenu.cpp:99
 msgid "INV"
-msgstr ""
+msgstr "INV "
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
@@ -4848,7 +4843,7 @@ msgstr ""
 #. TRANSLATORS: short button name for skills window.
 #: src/gui/windowmenu.cpp:108
 msgid "SKI"
-msgstr ""
+msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
 #: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
@@ -4858,7 +4853,7 @@ msgstr "Habilitats "
 #. TRANSLATORS: short button name for specials window.
 #: src/gui/windowmenu.cpp:116
 msgid "SPE"
-msgstr ""
+msgstr "SPE"
 
 #: src/gui/windowmenu.cpp:117
 msgid "Specials"
@@ -4867,7 +4862,7 @@ msgstr "Especials "
 #. TRANSLATORS: short button name for social window.
 #: src/gui/windowmenu.cpp:122
 msgid "SOC"
-msgstr ""
+msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
@@ -4878,17 +4873,17 @@ msgstr "Social "
 #. TRANSLATORS: short button name for shortcuts window.
 #: src/gui/windowmenu.cpp:126
 msgid "SH"
-msgstr ""
+msgstr "DR"
 
 #. TRANSLATORS: short button name for spells window.
 #: src/gui/windowmenu.cpp:130
 msgid "SP"
-msgstr ""
+msgstr "CON"
 
 #. TRANSLATORS: short button name for drops window.
 #: src/gui/windowmenu.cpp:134
 msgid "DR"
-msgstr ""
+msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
 #: src/gui/windowmenu.cpp:138
@@ -4923,7 +4918,7 @@ msgstr ""
 #. TRANSLATORS: short button name for setup window.
 #: src/gui/windowmenu.cpp:163
 msgid "SET"
-msgstr ""
+msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
@@ -5263,7 +5258,7 @@ msgstr "Canvia compta d'accés "
 #: src/gui/windows/charselectdialog.cpp:586
 #: src/gui/windows/updaterwindow.cpp:187
 msgid "Play"
-msgstr ""
+msgstr "Juga"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
@@ -6495,77 +6490,77 @@ msgstr "Punts de personatge: %d "
 #: src/gui/windows/statuswindow.cpp:388
 #, c-format
 msgid "Correction points: %d"
-msgstr ""
+msgstr "Punts de correcció: %d"
 
 #. TRANSLATORS: target type
 #: src/gui/windows/textcommandeditor.cpp:99
 msgid "No Target"
-msgstr ""
+msgstr "Cap objectiu "
 
 #. TRANSLATORS: target type
 #: src/gui/windows/textcommandeditor.cpp:101
 msgid "Allow Target"
-msgstr ""
+msgstr "Habilita objectiu "
 
 #. TRANSLATORS: target type
 #: src/gui/windows/textcommandeditor.cpp:103
 msgid "Need Target"
-msgstr ""
+msgstr "Es necessita objectiu"
 
 #. TRANSLATORS: magic school
 #: src/gui/windows/textcommandeditor.cpp:109
 msgid "General Magic"
-msgstr ""
+msgstr "Màgia General "
 
 #. TRANSLATORS: magic school
 #: src/gui/windows/textcommandeditor.cpp:111
 msgid "Life Magic"
-msgstr ""
+msgstr "Màgia de Vida "
 
 #. TRANSLATORS: magic school
 #: src/gui/windows/textcommandeditor.cpp:113
 msgid "War Magic"
-msgstr ""
+msgstr "Màgia de Guerra "
 
 #. TRANSLATORS: magic school
 #: src/gui/windows/textcommandeditor.cpp:115
 msgid "Transmute Magic"
-msgstr ""
+msgstr "Màgia de Transmutació "
 
 #. TRANSLATORS: magic school
 #: src/gui/windows/textcommandeditor.cpp:117
 msgid "Nature Magic"
-msgstr ""
+msgstr "Màgia de la Natura "
 
 #. TRANSLATORS: magic school
 #: src/gui/windows/textcommandeditor.cpp:119
 msgid "Astral Magic"
-msgstr ""
+msgstr "Màgia Astral "
 
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:162
 msgid "Command Editor"
-msgstr ""
+msgstr "Editor d'ordres "
 
 #. TRANSLATORS: command editor button
 #: src/gui/windows/textcommandeditor.cpp:167
 msgid "magic"
-msgstr ""
+msgstr "màgia  "
 
 #. TRANSLATORS: command editor button
 #: src/gui/windows/textcommandeditor.cpp:169
 msgid "other"
-msgstr ""
+msgstr "altres "
 
 #. TRANSLATORS: command editor label
 #: src/gui/windows/textcommandeditor.cpp:171
 msgid "Symbol:"
-msgstr ""
+msgstr "Símbol: "
 
 #. TRANSLATORS: command editor label
 #: src/gui/windows/textcommandeditor.cpp:174
 msgid "Command:"
-msgstr ""
+msgstr "Ordre: "
 
 #. TRANSLATORS: command editor label
 #: src/gui/windows/textcommandeditor.cpp:177
@@ -6575,105 +6570,105 @@ msgstr ""
 #. TRANSLATORS: command editor label
 #: src/gui/windows/textcommandeditor.cpp:181
 msgid "Target Type:"
-msgstr ""
+msgstr "Tipus d'objectiu: "
 
 #. TRANSLATORS: command editor label
 #: src/gui/windows/textcommandeditor.cpp:185
 msgid "Icon:"
-msgstr ""
+msgstr "Icona: "
 
 #. TRANSLATORS: command editor label
 #: src/gui/windows/textcommandeditor.cpp:188
 msgid "Mana:"
-msgstr ""
+msgstr "Mana: "
 
 #. TRANSLATORS: command editor label
 #: src/gui/windows/textcommandeditor.cpp:191
 msgid "Magic level:"
-msgstr ""
+msgstr "Nivell Màgic: "
 
 #. TRANSLATORS: command editor label
 #: src/gui/windows/textcommandeditor.cpp:195
 msgid "Magic School:"
-msgstr ""
+msgstr "Escola de màgia: "
 
 #. TRANSLATORS: command editor label
 #: src/gui/windows/textcommandeditor.cpp:198
 msgid "School level:"
-msgstr ""
+msgstr "Nivell d'escola: "
 
 #. TRANSLATORS: command editor button
 #: src/gui/windows/textcommandeditor.cpp:203
 msgid "Save"
-msgstr ""
+msgstr "Guardar "
 
 #. TRANSLATORS: trade window button
 #: src/gui/windows/tradewindow.cpp:59
 msgid "Propose trade"
-msgstr ""
+msgstr "Proposar intercanvi "
 
 #. TRANSLATORS: trade window button
 #: src/gui/windows/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
-msgstr ""
+msgstr "Confirmat. Espera... "
 
 #. TRANSLATORS: trade window button
 #: src/gui/windows/tradewindow.cpp:63
 msgid "Agree trade"
-msgstr ""
+msgstr "Acceptar intercanvi"
 
 #. TRANSLATORS: trade window button
 #: src/gui/windows/tradewindow.cpp:65
 msgid "Agreed. Waiting..."
-msgstr ""
+msgstr "Acceptat. Espera..."
 
 #. TRANSLATORS: trade window caption
 #: src/gui/windows/tradewindow.cpp:69
 msgid "Trade: You"
-msgstr ""
+msgstr "Intercanvi: Tu "
 
 #. TRANSLATORS: trade window money label
 #: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
-msgstr ""
+msgstr "Aconsegueixes %s "
 
 #. TRANSLATORS: trade window money change button
 #: src/gui/windows/tradewindow.cpp:82
 msgid "Change"
-msgstr "canvi"
+msgstr "Canvi"
 
 #. TRANSLATORS: trade window money label
 #: src/gui/windows/tradewindow.cpp:126
 msgid "You give:"
-msgstr ""
+msgstr "Ofereixes: "
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:389
 msgid "You don't have enough money."
-msgstr ""
+msgstr "No tens diners suficients.  "
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:475
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
+msgstr "No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus d'objecte a la finestra."
 
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:62
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "Nom: %s"
 
 #. TRANSLATORS: updater window name
 #: src/gui/windows/updaterwindow.cpp:158
 msgid "Updating..."
-msgstr ""
+msgstr "Actualitzant... "
 
 #. TRANSLATORS: updater window label
 #: src/gui/windows/updaterwindow.cpp:183
 msgid "Connecting..."
-msgstr ""
+msgstr "Connectant... "
 
 #: src/gui/windows/updaterwindow.cpp:369
 msgid "Show all news (can be slow)"
@@ -6682,62 +6677,62 @@ msgstr ""
 #. TRANSLATORS: update message
 #: src/gui/windows/updaterwindow.cpp:757
 msgid "##1  The update process is incomplete."
-msgstr ""
+msgstr "##1 El procés d'actualització està incomplet. "
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
 #: src/gui/windows/updaterwindow.cpp:759
 msgid "##1  It is strongly recommended that"
-msgstr ""
+msgstr "##1 Això es altament recomanat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
 #: src/gui/windows/updaterwindow.cpp:761
 msgid "##1  you try again later."
-msgstr ""
+msgstr "##1 tornes a provar més tard. "
 
 #. TRANSLATORS: updater window label
 #: src/gui/windows/updaterwindow.cpp:939
 msgid "Completed"
-msgstr ""
+msgstr "Complet "
 
 #. TRANSLATORS: who is online window name
 #: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:641
 msgid "Who Is Online - Updating"
-msgstr ""
+msgstr "Qui Està en Línia - Actualitzant "
 
 #. TRANSLATORS: who is online. button.
 #: src/gui/windows/whoisonline.cpp:95
 msgid "Update"
-msgstr ""
+msgstr "Actualitza"
 
 #. TRANSLATORS: who is online window name
 #: src/gui/windows/whoisonline.cpp:212
 msgid "Who Is Online - "
-msgstr ""
+msgstr "Qui Està En Línia - "
 
 #. TRANSLATORS: who is online window name
 #: src/gui/windows/whoisonline.cpp:656
 msgid "Who Is Online - error"
-msgstr ""
+msgstr "Qui Està En Línia - error "
 
 #. TRANSLATORS: who is online window name
 #: src/gui/windows/whoisonline.cpp:698
 msgid "Who Is Online - Update"
-msgstr ""
+msgstr "Qui Està En Línia - Actualitza "
 
 #. TRANSLATORS: world select dialog name
 #: src/gui/windows/worldselectdialog.cpp:84
 msgid "Select World"
-msgstr ""
+msgstr "Escolleix Món "
 
 #. TRANSLATORS: world dialog button
 #: src/gui/windows/worldselectdialog.cpp:90
 msgid "Change Login"
-msgstr ""
+msgstr "Canvia de sessió "
 
 #. TRANSLATORS: world dialog button
 #: src/gui/windows/worldselectdialog.cpp:92
 msgid "Choose World"
-msgstr ""
+msgstr "Tria Món  "
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
diff --git a/po/cs.po b/po/cs.po
index 16d087271..f91b245bc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
 "cs/)\n"
@@ -530,7 +530,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 "Nastavení"
 
@@ -746,7 +747,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:152
 msgid "Party name is missing."
 msgstr "Chybí jméno party."
 
@@ -935,14 +936,14 @@ 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 "Obecná"
 
 #. 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 "Debug"
@@ -1078,7 +1079,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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Jdi sem"
 
@@ -1190,7 +1191,7 @@ msgstr "Vložit jméno do chatu"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1199,7 +1200,7 @@ msgstr "Vložit jméno do chatu"
 #: 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
@@ -1272,7 +1273,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1342,7 +1343,7 @@ msgstr "Vypnout \"away\""
 #. 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 "Odejít"
 
@@ -1424,7 +1425,7 @@ msgstr "Přidat vše do transakce"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Uložit"
 
@@ -1803,9 +1804,8 @@ msgstr "Jdi na navigační bod"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "Klávesa modifikátoru"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2046,23 +2046,45 @@ msgid "Next Social Tab"
 msgstr "Další záložka společenství"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Předchozí záložka společenství"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Zkratková klávesa předmětů"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Předchozí záložka chatu"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Další záložka chatu"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 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
@@ -2085,38 +2107,38 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Zkratka smajlíku %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Obléct výstroj"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Kopírovat výstroj"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Kopírovat výbavu do výstroje"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 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
@@ -2139,228 +2161,228 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Přepnout chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Rolovat chat nahoru"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Rolovat chat dolů"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Předchozí záložka chatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Další záložka chatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Zavřít stávající záložku chatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Předchozí řádek chatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Další řádek chatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Ignorovat vstup 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Ignorovat vstup 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Otočit nahoru"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Otočit dolů"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Otočit vlevo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Otočit vpravo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Šílené pohyby"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Změnit mód šílených pohybů"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Rychle zahoď N předmětů ze slotu 0"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Rychle zahoď N předmětů"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Přepni počet rychlého zahození"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Rychlé léčení cíle nebo sebe"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Použít kouzlo #itenplz"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Použít magický útok"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Přepnout magický útok"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Změnit typ pohybu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Změnit typ útočné zbraně"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Změnit typ útoku"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Změnit mód následování"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Změnit mód imitace"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "Zapnout/Vypnout audio"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Zapnout/Vypnout Away mód"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Emulovat pravý klik z klávesnice"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "přemnout mód kamery"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Pohyb nahoru"
 
 #. 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 Down"
 msgstr "Pohyb dolů"
 
 #. 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 Left"
 msgstr "Pohyb vlevo"
 
 #. 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 Right"
 msgstr "Pohyb vpravo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2383,32 +2405,34 @@ msgstr ""
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr "Pohyb a výběr"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr ""
 
@@ -2417,7 +2441,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2428,12 +2452,12 @@ msgid "Other"
 msgstr "Ostatní"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr ""
 
@@ -2443,7 +2467,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2452,45 +2476,45 @@ msgid "Delete"
 msgstr "Smazat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Zkratky"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2498,7 +2522,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2506,13 +2530,13 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr ""
 
@@ -2843,13 +2867,13 @@ msgid "%s whispers: %s"
 msgstr "%s šeptá: %s"
 
 #. 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 ""
@@ -2872,7 +2896,7 @@ msgstr "Gilda"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr ""
 
@@ -2886,7 +2910,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Pokud <nick> obsahuje mezeru, uzavřete jej do uvozovek (\")."
 
@@ -2894,7 +2918,7 @@ msgstr "Pokud <nick> obsahuje mezeru, uzavřete jej do uvozovek (\")."
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr ""
 
@@ -2907,26 +2931,26 @@ 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4717,48 +4741,48 @@ msgid "Allow screensaver to run"
 msgstr "Povol spuštění spořiče obrazovky"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignoruj jiného hráče"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Přestaň ignorovat jiného hráče"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Zavři záložku šeptání"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Příkaz: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Tento příkaz zavře aktuální záložku šeptání."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Příkaz: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Tímto příkazem ignoruješ jiného hráče nezávisle na nastavení vztahu s ním."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Příkaz: /unignore <player>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Tímto příkazem přestaneš ignorovat jiného hráče pokud byl před tím ignorován."
@@ -5044,7 +5068,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 "Vytvořit"
 
@@ -6120,12 +6144,12 @@ msgid "requires v%s"
 msgstr "potřebuje v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Použít"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Resetovat okna"
 
@@ -6341,131 +6365,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 "Vytvořit partu"
 
 #. 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 "Pozvat"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Vytvářím gildu s názvem %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Vytvářím partu s názvem %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Název gildy"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Zvolte jméno vaší gildy."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
 
 #. 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 "%s vás zve ke vstupu do gildy %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
 
 #. 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 "Byli jste pozváni k připojení se do party."
 
 #. 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 "Byli jste pozváni k připojení se do party %s."
 
 #. 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 "%s vás pozval ke vstupu do své party."
 
 #. 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 "%s vás zve ke vstupu do party: %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Jméno party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
@@ -7076,136 +7100,136 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 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
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 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
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 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:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Sdílení předmětů povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Sdílení předmětů zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "Sdílení předmětů není možné."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Stav sdílení předmětů neznámý."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Sdílení zkušeností povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Sdílení zkušeností zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "Sdílení zkušeností není možné."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr "Stav sdílení zkušeností neznámý."
 
@@ -7999,6 +8023,3 @@ msgstr "Neznámý předmět"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "Zastavit Útok"
diff --git a/po/da.po b/po/da.po
index fa698cd6e..807f3424d 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/manaplus/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -538,7 +538,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 "Video"
 
@@ -661,7 +661,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 ""
@@ -683,7 +683,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 ""
 
@@ -888,25 +888,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 ""
 
@@ -942,23 +942,23 @@ 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 "Gemningen af skærmbilledet fejlede!"
 
 #. 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 "Netværksfejl"
 
@@ -1072,7 +1072,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1184,7 +1184,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1266,7 +1266,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1418,7 +1418,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/setup.cpp:94
 msgid "Store"
 msgstr "Gem på lager"
 
@@ -1483,7 +1483,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 "Brug"
 
@@ -1674,9 +1674,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 "Tag af"
 
@@ -1685,7 +1685,7 @@ msgstr "Tag af"
 #. 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 "Tag på"
 
@@ -1693,7 +1693,7 @@ msgstr "Tag på"
 #. 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 ""
 
@@ -1708,7 +1708,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 "Smid"
 
@@ -1797,8 +1797,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Stop angreb"
+msgid "Stop Attack / Modifier key"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2313,100 +2313,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr "Flyt op"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr "Flyt ned"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr "Flyt til højre"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2415,7 +2410,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2426,12 +2421,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2441,7 +2436,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:1803 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
@@ -2450,45 +2445,45 @@ msgid "Delete"
 msgstr "Slet"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2496,7 +2491,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2504,13 +2499,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2728,7 +2723,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
@@ -4371,8 +4366,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 "Ændringerne kræver at du genstarter klienten."
 
@@ -4459,106 +4454,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 "Fuld Skærm"
 
 #. 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 "Brugerdefineret cursor"
 
 #. 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 "Ændringerne kræver at du genstarter klienten."
 
 #. 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 "Ændringerne til OpenGL kræver at du genstarter klienten."
 
 #. 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 ""
 
@@ -4823,7 +4818,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 "Udstyr"
diff --git a/po/de.po b/po/de.po
index 6ba75d396..7f9c2844f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
@@ -539,7 +539,8 @@ msgstr "Schwebende Blase"
 #. 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 "Einstellungen"
 
@@ -756,7 +757,7 @@ msgstr "Cache geleert"
 
 #. 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:152
 msgid "Party name is missing."
 msgstr "Name der Gruppe fehlt."
 
@@ -946,14 +947,14 @@ 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 "Allgemein"
 
 #. 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 "Debug"
@@ -1089,7 +1090,7 @@ msgstr "Atombombe"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Bewegen"
 
@@ -1201,7 +1202,7 @@ msgstr "Füge Name dem Chat hinzu"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1210,7 +1211,7 @@ msgstr "Füge Name dem Chat hinzu"
 #: 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
@@ -1283,7 +1284,7 @@ msgstr "Bewege Kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1353,7 +1354,7 @@ msgstr "Deaktiviere abwesend"
 #. 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 "Verlassen"
 
@@ -1435,7 +1436,7 @@ msgstr "Alles zum Handeln hinzufügen"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Aufbewahren"
 
@@ -1814,9 +1815,8 @@ msgstr "Bewegen zum Navigationspunkt"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "Kurzbefehle Modifier-Tasten"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2057,23 +2057,45 @@ msgid "Next Social Tab"
 msgstr "Nächster Gesellschaftstab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Vorheriger Gesellschaftstab"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Item-Tastenkürzel"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Voriges Chatunterfenster"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Nächstes Chatunterfenster"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr "Gefühle Modifier-Tasten"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr "Gefühl Modifier-Taste"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 msgid "Emote shortcuts"
 msgstr "Gefühle Kurzbefehlstasten"
 
 #. 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
@@ -2096,38 +2118,38 @@ msgstr "Gefühle Kurzbefehlstasten"
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Gefühlstaste %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr "Ausrüstungstasten"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Ausrüstung anziehen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Ausrüstung kopieren"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Kopiere aktuelle Ausrüstung zum Ausrüstungsauswahldialog"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 msgid "Outfits shortcuts"
 msgstr "Ausrüstung Kurzbefehle"
 
 #. 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
@@ -2150,228 +2172,228 @@ msgstr "Ausrüstung Kurzbefehle"
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr "Ausrüstung Kurzbefehl %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Im Chat hoch scrollen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Im Chat runter scrollen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Voriges Chatunterfenster"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Nächstes Chatunterfenster"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Schließe aktuelles Chatunterfenster"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Vorherige Chat-Zeile"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Nächste Chat-Zeile"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Ignoriere Eingabe 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Richtung oben"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Richtung unten"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Richtung links"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Richtung rechts"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Verrückte Bewegungen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Verändere den verrückte Bewegungen-Modus"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Lass N Items von Slot 0 fallen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Lass N Items fallen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Ändere den Abwurfzähler"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Heile Ziel/dich selbst"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Benutze #itenplz Spruch"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Benutze magische Angriff"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Wechsle magische Angriff"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr "Wechsle PVP Attacke"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Wechsle die Bewegungsart"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Verändere die Angriffswaffe"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Wechsle Angriffsart"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Wechsle Folgenmodus"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Wechsle Imitierenmodus"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr "Aktiviere / Deaktiviere Spielmodifikationstasten"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "An/Aus Audio"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Aktiviere/Deaktiviere Abwesendmodus"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Emuliere Rechts-Klick mit der Tastatur"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "Ändere Kameramodus"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr "Zeige Onscreen Tastatur"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr "Bewegungstasten"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Laufe Hoch"
 
 #. 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 Down"
 msgstr "Laufe Runter"
 
 #. 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 Left"
 msgstr "Laufe nach Links"
 
 #. 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 Right"
 msgstr "Laufe nach Rechts"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr "Kurzbefehle für die Bewegung zu einem Navigationspunkt"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2394,32 +2416,34 @@ msgstr "Kurzbefehle für die Bewegung zu einem Navigationspunkt"
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr "Kurzbefehl Bewegung zu Punkt %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr "Auswählen & Bewegen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr "Bewegen zum Anfang"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr "Bewegen zum Ende"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr "Seite hoch"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr "Seite runter"
 
@@ -2428,7 +2452,7 @@ msgstr "Seite runter"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2439,12 +2463,12 @@ msgid "Other"
 msgstr "Sonstig"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr "Auswahl"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr "Auswahl 2"
 
@@ -2454,7 +2478,7 @@ msgstr "Auswahl 2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2463,45 +2487,45 @@ msgid "Delete"
 msgstr "Löschen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr "Einfügen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr "Tab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr "Mod"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr "Normal"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Tastenkürzel"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "Fenster"
@@ -2509,7 +2533,7 @@ msgstr "Fenster"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr "Gefühle"
@@ -2517,13 +2541,13 @@ msgstr "Gefühle"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr "GUI"
 
@@ -2854,13 +2878,13 @@ msgid "%s whispers: %s"
 msgstr "%s flüstert: %s"
 
 #. 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 "%s ist jetzt Online."
 
 #. 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 "%s ist jetzt Offline."
@@ -2883,7 +2907,7 @@ msgstr "Gilde"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "Befehl:/invite<nick>"
 
@@ -2897,7 +2921,7 @@ msgstr "Dieser Befehl lädt <nick> in deine Gilde ein."
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
@@ -2907,7 +2931,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "Befehl:/leave"
 
@@ -2920,26 +2944,26 @@ msgstr "Dieser Kommando wirft einen Spieler aus der Gilde."
 #. 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > zeigt diese Hilfe."
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Lade einen Spieler in deine Gruppe ein"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Verlasse die Gilde, in der du bist"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4735,47 +4759,47 @@ msgid "Allow screensaver to run"
 msgstr "Erlaube Bildschirmschoner"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Anderen Spieler ignorieren"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Anderen Spieler nicht mehr ignorieren"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Schließe einen privates Chatunterfenster"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Befehl: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Dieser Befehl schließt das aktuelle private Chatunterfenster."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Befehl:/ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Dieser Befehl ignoriert andere Spieler ohne Rücksicht auf Beziehungen."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Befehl: /unignore <Spieler>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Dieser Kommando stoppt das Ignorieren eines Spielers, sofern er ignoriert "
@@ -5062,7 +5086,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 "Erstellen"
 
@@ -6138,12 +6162,12 @@ msgid "requires v%s"
 msgstr "benötigt v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Anwenden"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
@@ -6359,132 +6383,132 @@ 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 "Gruppe erstellen"
 
 #. 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 "P"
 
 #. 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 "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/socialwindow.cpp:1302
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Gruppeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Gruppeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Gildeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Gildeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle die Gruppe \"%s\""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Gildenname"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Gruppe erhalten, es wurde schon einmal angefragt."
 
 #. 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 "%s hat dich eingeladen, seiner Gilde %s beizutreten."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr ""
 "Anfrage für eine Gruppe erhalten, aber du bist bereits in einer Gruppe."
 
 #. 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 "Du wurdest zu einer Gruppe eingeladen."
 
 #. 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 "Du wurdest zu der Gruppe %s eingeladen."
 
 #. 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 "%s hat dich in seine Gruppe eingeladen."
 
 #. 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 "%s hat dich eingeladen, an der Gruppe %s teilzunehmen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Nehme Gruppeneinladung an"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "Konnte keine Gruppe erstellen. Du bist schon in einer Gruppe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Gruppenname"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Name deiner Gruppe wählen."
 
@@ -7100,51 +7124,51 @@ msgid "Guild castle: %s"
 msgstr "Gildenburg: %s"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Lade einen Spieler in deine Gruppe ein."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > verlasse die Gruppe, in der du bist."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Zeige/ändere Gruppen-Freigaberichtlinie für Gegenstände."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Zeige/ändere Gruppe-Freigaberichtlinie für EP."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "Dieser Kommando lädt <nick> in deine Gruppe ein."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "Dieser Kommando wirft einen Spieler aus der Gruppe."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Befehl: /item <Regel>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "Dieser Kommando ändert Gruppen-Freigaberichtlinie für Gegenstände."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7153,29 +7177,29 @@ msgstr ""
 "\"0\", \"no\", \"false\" sein, um es zu deaktivieren."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Befehl: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Dieser Kommando zeigt die derzeitigen Gruppen-Freigaberichtlinie für "
 "Gegenstände."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "Kommando: /exp <policy>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr "Dieser Kommando verändert die Gruppen-Freigaberichtlinie für EP."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7184,59 +7208,59 @@ msgstr ""
 "\"0\", \"no\", \"false\" sein, um es zu deaktivieren."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "Befehl:/exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Dieser Kommando zeigt die derzeitigen Gruppen-Freigaberichtlinie für EP."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Item-Sharing aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Item-Sharing deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "Item-Sharing ist nicht möglich."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Item-Sharing unbekannt."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Erfahrung teilen ist aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Erfahrung teilen ist deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "Erfahrung teilen nicht möglich."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr "Erfahrung teilen unbekannt."
 
@@ -8039,9 +8063,3 @@ msgstr "Unbekannter Gegenstand"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "Angriff abbrechen"
-
-#~ msgid "Modifier key"
-#~ msgstr "Modifikationstaste"
diff --git a/po/el.po b/po/el.po
index 32401531e..c957bb902 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/manaplus/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -537,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 ""
 
@@ -660,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 " %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί!Έξοδος."
@@ -682,7 +682,7 @@ msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Σφάλμα: %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί! Εγκατάλειψη."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2998
+#: src/client.cpp:3000
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -887,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 ""
 
@@ -941,23 +941,23 @@ 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 "Σφάλμα δικτύου"
 
@@ -1071,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Κίνηση"
 
@@ -1183,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1265,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1417,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/setup.cpp:94
 msgid "Store"
 msgstr "Κατάστημα"
 
@@ -1482,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 "Χρήση"
 
@@ -1673,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 ""
 
@@ -1684,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 "Equip"
 
@@ -1692,7 +1692,7 @@ msgstr "Equip"
 #. 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 "Πέτα ..."
 
@@ -1707,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 "Πέτα"
 
@@ -1796,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
@@ -2312,100 +2312,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2409,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2420,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2435,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:1803 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
@@ -2449,45 +2444,45 @@ msgid "Delete"
 msgstr "Διαγραφή"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2490,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2498,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2727,7 +2722,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
@@ -4370,8 +4365,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 ""
 
@@ -4458,106 +4453,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 "Μερικά παράθυρα μπορούν να μετακινούνται για να ταιριάξει στην χαμηλότερη ανάλυση."
 
@@ -4822,7 +4817,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 "Εξοπλισμός"
diff --git a/po/en_GB.po b/po/en_GB.po
index df4d952b0..e85877cbf 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -538,7 +538,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 "Video"
 
@@ -661,7 +661,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 ""
@@ -683,7 +683,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 ""
 
@@ -888,25 +888,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 ""
 
@@ -942,23 +942,23 @@ 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 "Saving screenshot failed!"
 
 #. 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 "Network Error"
 
@@ -1072,7 +1072,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1184,7 +1184,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1266,7 +1266,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1418,7 +1418,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/setup.cpp:94
 msgid "Store"
 msgstr "Store"
 
@@ -1483,7 +1483,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 "Use"
 
@@ -1674,9 +1674,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 "Unequip"
 
@@ -1685,7 +1685,7 @@ msgstr "Unequip"
 #. 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 "Equip"
 
@@ -1693,7 +1693,7 @@ msgstr "Equip"
 #. 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 ""
 
@@ -1708,7 +1708,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 "Drop"
 
@@ -1797,8 +1797,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Stop Attack"
+msgid "Stop Attack / Modifier key"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2313,100 +2313,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr "Move Up"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr "Move Down"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr "Move Left"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr "Move Right"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2415,7 +2410,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2426,12 +2421,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2441,7 +2436,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:1803 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
@@ -2450,45 +2445,45 @@ msgid "Delete"
 msgstr "Delete"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2496,7 +2491,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2504,13 +2499,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:1922 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
 msgid "Gui"
 msgstr ""
 
@@ -2728,7 +2723,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
@@ -4371,8 +4366,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 "Restart your client for the change to take effect."
 
@@ -4459,106 +4454,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 "Full screen"
 
 #. 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 "Custom cursor"
 
 #. 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 "Restart needed for changes to take effect."
 
 #. 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 "Applying change to OpenGL requires restart."
 
 #. 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 ""
 
@@ -4823,7 +4818,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 "Equipment"
diff --git a/po/eo.po b/po/eo.po
index 99cbe2995..c3dc481ed 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,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-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -538,7 +538,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 "Video"
 
@@ -661,7 +661,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 ""
@@ -683,7 +683,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 ""
 
@@ -888,25 +888,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 ""
 
@@ -942,23 +942,23 @@ 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 ""
 
@@ -1072,7 +1072,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Movi"
 
@@ -1184,7 +1184,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1266,7 +1266,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1418,7 +1418,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1483,7 +1483,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 "Uzi"
 
@@ -1674,9 +1674,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 ""
 
@@ -1685,7 +1685,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 ""
 
@@ -1693,7 +1693,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 ""
 
@@ -1708,7 +1708,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 ""
 
@@ -1797,7 +1797,7 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
@@ -2313,100 +2313,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr "Movi supren"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr "Movi malsupren"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr "Movi maldekstren"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr "Movi dekstren"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2415,7 +2410,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2426,12 +2421,12 @@ msgid "Other"
 msgstr "Alia"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2441,7 +2436,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:1803 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
@@ -2450,45 +2445,45 @@ msgid "Delete"
 msgstr "Forigi"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "Fenestroj"
@@ -2496,7 +2491,7 @@ msgstr "Fenestroj"
 #. 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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2504,13 +2499,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:1922 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Babilado"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
 msgid "Gui"
 msgstr ""
 
@@ -2728,7 +2723,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
@@ -4371,8 +4366,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 ""
 
@@ -4459,106 +4454,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 "Plenekrano"
 
 #. 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 ""
 
@@ -4823,7 +4818,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 ""
diff --git a/po/es.po b/po/es.po
index 8f4e314ac..de330b5f2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 20:13+0000\n"
+"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
 "Language: es\n"
@@ -535,7 +535,8 @@ msgstr "Burbuja flotante"
 #. 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 "Configuración"
 
@@ -751,7 +752,7 @@ msgstr "Caché limpiada"
 
 #. 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:152
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
@@ -901,15 +902,15 @@ msgstr "Variables de entorno vaciadas"
 
 #: src/commands.cpp:1342
 msgid "Uploaded config into:"
-msgstr ""
+msgstr "Configuraciones subidas a:"
 
 #: src/commands.cpp:1349
 msgid "Uploaded server config into:"
-msgstr ""
+msgstr "Configuraciones del servidor subidas a:"
 
 #: src/commands.cpp:1356
 msgid "Uploaded log into:"
-msgstr ""
+msgstr "Registro subido a:"
 
 #. TRANSLATORS: dump command
 #: src/commands.cpp:1476 src/commands.cpp:1485
@@ -941,14 +942,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. 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 "General"
 
 #. 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 "Depurador"
@@ -1084,7 +1085,7 @@ msgstr "Eliminar"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Mover"
 
@@ -1196,7 +1197,7 @@ msgstr "Agregar nombre al chat"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1205,7 +1206,7 @@ msgstr "Agregar nombre al chat"
 #: 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
@@ -1278,7 +1279,7 @@ msgstr "Mover cámara"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1348,7 +1349,7 @@ msgstr "Deshabilitar ausencia"
 #. 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 "Dejar"
 
@@ -1430,7 +1431,7 @@ msgstr "Agregar todo al intercambio"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Almacenar"
 
@@ -1809,9 +1810,8 @@ msgstr "Moverse al punto de navegación"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "Teclas de atajo modificadoras"
+msgstr "Detener ataque / Tecla modificadora"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2052,23 +2052,45 @@ msgid "Next Social Tab"
 msgstr "Pestaña Social Siguiente"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Pestaña Social Previa"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Tecla de atajo al elemento"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Pestaña de anterior del chat"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Pestaña siguiente del chat"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr "Teclas de emotes modificadoras"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr "Tecla de emotes modificadoras"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 msgid "Emote shortcuts"
 msgstr "Tecla de emote"
 
 #. 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
@@ -2091,38 +2113,38 @@ msgstr "Tecla de emote"
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atajo para Emoticono %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr "Teclas de vestimenta"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Ponerse vestimenta"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Copiar vestimenta"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Copiar lo equipado a la Vestimenta"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 msgid "Outfits shortcuts"
 msgstr "Atajos a vestimenta"
 
 #. 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
@@ -2145,228 +2167,228 @@ msgstr "Atajos a vestimenta"
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr "Atajo a la Vestimenta %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Activar el chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Desplazar el chat hacia arriba"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Desplazar el chat hacia abajo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Pestaña de anterior del chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Pestaña siguiente del chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Cerrar la Pestaña activa del Chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Línea previa del chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Siguiente línea del chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr "Tecla modificadora de chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Mirar hacia arriba"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Mirar hacia abajo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Mirar a la izquierda"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Mirar a la derecha"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Movimientos alocados"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Cambiar modo de movimiento alocado"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Tirar N artículos de la ranura 0"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Tirar N artículos rápidamente"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Cambiar el contador de lanzamientos"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Curar rápidamente a objetivo o a sí mismo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Usar el hechizo #itenplz"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Usar ataque mágico"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Alternar ataque mágico"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr "Intercambiar ataque pvp"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Cambiar tipo de movimiento"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Cambiar tipo de arma de ataque"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Cambiar tipo de ataque"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Cambiar modo de seguimiento"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Cambiar modo de imitación"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Deshabilitar teclas modificadoras"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "Encender / Apagar audio"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Deshabilitar modo AFK"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Emular clic derecho desde el teclado"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "Intercambiar el modo de cámara"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr "Mostrar teclado en pantalla"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr "Teclas de movimiento"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Moverse hacia arriba"
 
 #. 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 Down"
 msgstr "Moverse hacia abajo"
 
 #. 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 Left"
 msgstr "Moverse a la izquierda"
 
 #. 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 Right"
 msgstr "Moverse a la derecha"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr "Muévase adelante"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr "Teclas de atajo para moverse al punto de navegacion"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2389,32 +2411,34 @@ msgstr "Teclas de atajo para moverse al punto de navegacion"
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr "Moverse a punto de atajo %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr "Mover y seleccionar"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr "Moverse a Home"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr "Moverse a End"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr "Page up"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr "Page down"
 
@@ -2423,7 +2447,7 @@ msgstr "Page down"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2434,12 +2458,12 @@ msgid "Other"
 msgstr "Otro"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr "Select"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr "Select2"
 
@@ -2449,7 +2473,7 @@ msgstr "Select2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2458,45 +2482,45 @@ msgid "Delete"
 msgstr "Borrar"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr "Insert"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr "Tab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr "Mod"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr "Ctrl"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr "Basico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Atajos"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "Ventanas"
@@ -2504,7 +2528,7 @@ msgstr "Ventanas"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr "Emotes"
@@ -2512,13 +2536,13 @@ msgstr "Emotes"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr "Interfaz"
 
@@ -2849,13 +2873,13 @@ msgid "%s whispers: %s"
 msgstr "%s susurra: %s"
 
 #. 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 "%s ahora está Conectado."
 
 #. 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 "%s ahora está Desconectado."
@@ -2878,7 +2902,7 @@ msgstr "Gremio"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "Comando: /invite <nick>"
 
@@ -2892,7 +2916,7 @@ msgstr "Este comando invita a <nick> al gremio en el que estás ."
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Si el <nick> tiene espacios, enciérralo entre comillas dobles (\")."
 
@@ -2900,7 +2924,7 @@ msgstr "Si el <nick> tiene espacios, enciérralo entre comillas dobles (\")."
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
@@ -2913,26 +2937,26 @@ msgstr "Este comando hace que dejes el gremio."
 #. 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > Mostrar la ayuda."
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Invitar a un jugador a tu gremio"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Dejar el gremio en el que estás"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr "/kick > Expulsar a alguien del gremio en el que estás"
 
@@ -3429,12 +3453,12 @@ msgstr "Girar la palanca y no presionar los botones"
 #. TRANSLATORS: mods tab in settings
 #: src/gui/widgets/tabs/setup_mods.cpp:41
 msgid "Mods"
-msgstr ""
+msgstr "Mods"
 
 #. TRANSLATORS: settings label
 #: src/gui/widgets/tabs/setup_mods.cpp:76
 msgid "No mods present"
-msgstr ""
+msgstr "No hay mods presentes"
 
 #. TRANSLATORS: show buttons at top right corner type
 #: src/gui/widgets/tabs/setup_other.cpp:42
@@ -3807,7 +3831,7 @@ msgstr "Tipo de proxy"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:324
 msgid "Proxy address:port"
-msgstr "Direccion: puerto"
+msgstr "Dirección de proxy:puerto"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:332
@@ -4638,11 +4662,11 @@ msgstr "Visual"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_visual.cpp:103
 msgid "Scale"
-msgstr ""
+msgstr "Escala"
 
 #: src/gui/widgets/tabs/setup_visual.cpp:110
 msgid "Scale "
-msgstr ""
+msgstr "Escala"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_visual.cpp:115
@@ -4731,49 +4755,49 @@ msgid "Allow screensaver to run"
 msgstr "Permitir ejecución de protector de pantalla"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignorar a otro jugador"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Dejar de ignorar a otro jugador"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Cerrar la pestaña de susurro"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Comando: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Este comando cierra la pestaña del susurro actual"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Comando: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Este comando ignora a otro jugador, independientemente de la relación actual "
 "con él."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jugador>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando deja de ignorar al jugador, si está siendo ignorado."
 
@@ -5058,7 +5082,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 "Crear"
 
@@ -6144,12 +6168,12 @@ msgid "requires v%s"
 msgstr "requiere v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Aplicar"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Restablecer ventanas"
 
@@ -6365,131 +6389,131 @@ msgstr "Amigos: %u/%u"
 
 #. 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 "Crear grupo"
 
 #. 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 "J"
 
 #. 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 "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/socialwindow.cpp:1302
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al gremio de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al gremio de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando gremio llamado %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Nombre del Gremio"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Escoge el nombre de tu gremio."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del gremio, pero ya existe uno."
 
 #. 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 "%s te ha invitado a unirte al gremio %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al gremio"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe uno."
 
 #. 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 "Has sido invitado a unirte un grupo."
 
 #. 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 "Has sido invitado a unirte al grupo %s."
 
 #. 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 "%s te ha invitado a unirte a su grupo."
 
 #. 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 "%s te ha invitado a unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "No se pudo crear el grupo; ya estás en uno."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Escoge el nombre de tu grupo."
 
@@ -7103,52 +7127,52 @@ msgid "Guild castle: %s"
 msgstr "Castillo del gremio: %s"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invitar a un jugador a tu grupo"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Dejar el grupo en el que estás"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr "/kick > Expulsar a alguien del grupo en el que estás"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Mostrar/Cambiar opciones para compartir objetos en el grupo"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Mostrar/Cambiar opciones para compartir experiencia en el grupo"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "Este comando invita al jugador <nick> a formar parte de tu grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "Este comando hace que dejes el grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Comando> /item <política>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 "Este comando cambia la política de compartición de artículos en el grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7157,30 +7181,30 @@ msgstr ""
 "\"0\", \"no\" y \"false\" para no compartirlos."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Comando: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Este comando muestra la política actual de compartición de artículos del "
 "grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <política>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 "Este comando cambia la política de compartición de experiencia del grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7189,12 +7213,12 @@ msgstr ""
 "\"0\", \"no\" y \"false\" para no compartir."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Este comando muestra la política actual de compartición experiencia del "
@@ -7202,47 +7226,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Compartir artículos habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Compartir artículos deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "No se pueden compartir artículos."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Compartir artículos desconocido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "Imposible compartir experiencia."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr "Compartir experiencia desconocido."
 
@@ -8043,9 +8067,3 @@ msgstr "Elemento desconocido"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr "mascota"
-
-#~ msgid "Stop Attack"
-#~ msgstr "Detener el ataque"
-
-#~ msgid "Modifier key"
-#~ msgstr "Tecla modificadora"
diff --git a/po/et.po b/po/et.po
index ccbb5a77d..43bbc678f 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -537,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 ""
 
@@ -660,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 ""
@@ -682,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 ""
 
@@ -887,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 ""
 
@@ -941,23 +941,23 @@ 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 ""
 
@@ -1071,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1183,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1265,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1417,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1482,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 ""
 
@@ -1673,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 ""
 
@@ -1684,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 ""
 
@@ -1692,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 ""
 
@@ -1707,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 ""
 
@@ -1796,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
@@ -2312,100 +2312,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2409,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2420,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2435,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:1803 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
@@ -2449,45 +2444,45 @@ msgid "Delete"
 msgstr "Kustuta"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2490,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2498,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:1922 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Vestlus"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
 msgid "Gui"
 msgstr ""
 
@@ -2727,7 +2722,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
@@ -4370,8 +4365,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 ""
 
@@ -4458,106 +4453,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 ""
 
@@ -4822,7 +4817,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 ""
diff --git a/po/fa.po b/po/fa.po
index 805582148..62d897a6f 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -536,7 +536,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 +659,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 +681,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 ""
 
@@ -886,25 +886,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 ""
 
@@ -940,23 +940,23 @@ 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 +1070,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1182,7 +1182,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1264,7 +1264,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1416,7 +1416,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1481,7 +1481,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 +1672,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 +1683,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 +1691,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 +1706,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 +1795,7 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
@@ -2311,100 +2311,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2413,7 +2408,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:1779 src/gui/setupactiondata.h:1924
 #: 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 +2419,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2439,7 +2434,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:1803 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 +2443,45 @@ msgid "Delete"
 msgstr "حذف"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2494,7 +2489,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2502,13 +2497,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2726,7 +2721,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
@@ -4369,8 +4364,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 +4452,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 ""
 
@@ -4821,7 +4816,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 "تجهیزات"
diff --git a/po/fi.po b/po/fi.po
index b4bec3ddc..694a43774 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: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
 "language/fi/)\n"
@@ -527,7 +527,8 @@ msgstr "Leijuva puhekupla"
 #. 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 "Asetukset"
 
@@ -743,7 +744,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:152
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
@@ -934,14 +935,14 @@ 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 "Yleiset"
 
 #. 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 "Debug"
@@ -1077,7 +1078,7 @@ msgstr "Pommita"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Liiku"
 
@@ -1189,7 +1190,7 @@ msgstr "Lisää nimi keskusteluun"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1198,7 +1199,7 @@ msgstr "Lisää nimi keskusteluun"
 #: 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
@@ -1271,7 +1272,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1341,7 +1342,7 @@ msgstr "Poista poissaolo käytöstä"
 #. 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 "Eroa"
 
@@ -1423,7 +1424,7 @@ msgstr "Lisää kaikki kauppaan"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Varastoi"
 
@@ -1802,9 +1803,8 @@ msgstr "Siirry reittipisteeseen"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "Muokkausnäppäin"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2045,23 +2045,45 @@ msgid "Next Social Tab"
 msgstr "Seuraava sos. välilehti"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Edellinen sos. välilehti"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Tavaroiden pikavalintanäppäin"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Edellinen keskusteluvälilehti"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Seuraava keskusteluvälilehti"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 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
@@ -2084,38 +2106,38 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Eleen pikavalinta %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Pue asu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Kopioi asu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Kopioi varusteet asuksi"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 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
@@ -2138,228 +2160,228 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Ota keskustelu käyttöön/pois käytöstä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Vieritä keskustelua ylös"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Vieritä keskustelua alas"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Edellinen keskusteluvälilehti"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Seuraava keskusteluvälilehti"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Sulje tämä keskusteluvälilehti"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Edellinen keskustelulinja"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Seuraava keskustelulinja"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Jätä huomiotta syöte 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Jätä huomiotta syöte 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Vie ylös"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Vie alas"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Vie vasemmalle"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Vie oikealle"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Villiliikkeet"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Muuta villiliiketilaa"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Pudota nopeasti N esinettä paikasta 0"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Pudota nopeasti N esinettä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Vaihda nopean pudotuksen laskuria"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Pikaparanna kohde tai itse"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Käytä #itenplz-loitsua"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Käytä magiahyökkäystä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Vaihda magiahyökkäystä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr "Vaihda PvP-hyökkäystä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Vaihda liikkumistyyppiä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Vaihda hyökkäysaseen tyyppiä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Vaihda hyökkäystyyppiä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Vaihda seuraustyyliä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Vaihda matkintatyyliä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr "Ota käyttöön / poista pelimuokkaimet"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "Äänet päälle / pois"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Aseta / peru poissaolo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Kontekstivalikkoon \"klikkaus\" näppäimistöltä"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "Vaihda kameran toimintaa"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Ylöspäin"
 
 #. 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 Down"
 msgstr "Alaspäin"
 
 #. 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 Left"
 msgstr "Vasemmalle"
 
 #. 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 Right"
 msgstr "Oikealle"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2382,32 +2404,34 @@ msgstr ""
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr ""
 
@@ -2416,7 +2440,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2427,12 +2451,12 @@ msgid "Other"
 msgstr "Muu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr ""
 
@@ -2442,7 +2466,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2451,45 +2475,45 @@ msgid "Delete"
 msgstr "Poista"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2497,7 +2521,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2505,13 +2529,13 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Keskustelu"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr ""
 
@@ -2842,13 +2866,13 @@ msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
 #. 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 ""
@@ -2871,7 +2895,7 @@ msgstr "Kilta"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "Komento: /invite <nimi>"
 
@@ -2885,7 +2909,7 @@ msgstr "Tämä komento kutsuu annetun pelaajan nykyiseen kiltaasi."
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jos nimessä on välilyöntejä, laita sen ympärille lainausmerkit (\")."
 
@@ -2893,7 +2917,7 @@ msgstr "Jos nimessä on välilyöntejä, laita sen ympärille lainausmerkit (\")
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "Komento: /leave"
 
@@ -2906,26 +2930,26 @@ msgstr "Tämä komento saa sinut eroamaan killasta."
 #. 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > Näytä tämä ohje."
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Kutsu pelaaja kiltaasi"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Eroa nykyisestä killastasi"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4714,49 +4738,49 @@ msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Jätä pelaaja huomiotta"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Huomioi pelaaja jälleen"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Sulje kuiskausvälilehti"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Komento: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Tämä komento sulkee avoinna olevan kuiskausvälilehden."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Komento: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Tämä komento jättää annetun pelaajan huomiotta; nykysuhteilla ei ole "
 "vaikutusta."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Komento: /unignore <pelaajan nimi>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 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."
@@ -5042,7 +5066,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 "Luo"
 
@@ -6116,12 +6140,12 @@ msgid "requires v%s"
 msgstr "vaatii version %s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Hyväksy"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
@@ -6337,131 +6361,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 "Luo ryhmä"
 
 #. 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 "Kutsu"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Killan nimi"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
 #. 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 "%s on kutsunut sinut liittymään kiltaan %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
 #. 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 "Sinut on kutsuttu liittymään ryhmään."
 
 #. 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 "Sinut on kutsuttu liittymään ryhmään %s."
 
 #. 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 "%s on kutsunut sinut liittymään ryhmäänsä."
 
 #. 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 "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
@@ -7071,51 +7095,51 @@ msgid "Guild castle: %s"
 msgstr "Killan linna: %s"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Kutsu pelaaja ryhmääsi"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Eroa nykyisestä ryhmästäsi"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Näytä/muuta ryhmän tavaranjaon asetuksia"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Näytä/muuta ryhmän kokemuksenjaon asetuksia"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "Tämä komento kutsuu annetun pelaajan ryhmääsi."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "Tämä komento erottaa pelaajan ryhmästä."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Komento: /item <jakopolitiikka>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "Tämä komento muuttaa ryhmän saaliinjakopolitiikkaa."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7124,27 +7148,27 @@ msgstr ""
 "saalis jaetaan, tai \"0\", \"no\" tai \"false\", jolloin saalista ei jaeta."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Komento: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr "Tämä komento näyttää ryhmän nykyisen saaliinjakopolitiikan."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "Komento: /exp <jakopolitiikka>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr "Tämä komento muuttaa ryhmän kokemuksenjaon politiikkaa."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7154,58 +7178,58 @@ msgstr ""
 "kokemuspisteitä ei jaeta."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "Komento: /exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Tämä komento näyttää ryhmän nykyisen kokemuksenjaon politiikan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Saaliinjako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Saaliinjako poistettu käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "Saaliinjako ei ole mahdollista."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Saaliinjaon tila on tuntematon."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Kokemuksen jako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Kokemuksen jako pois käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "Kokemuksen jako ei ole mahdollista."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr "Kokemuksen jaon tila on tuntematon."
 
@@ -8003,6 +8027,3 @@ msgstr "Tuntematon tavara"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "Keskeytä hyökkäys"
diff --git a/po/fr.po b/po/fr.po
index 0530c8ef7..a8aefa2f6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
@@ -534,7 +534,8 @@ msgstr "Bulle flottante"
 #. 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 "Configuration"
 
@@ -751,7 +752,7 @@ msgstr "Cache nettoyé"
 
 #. 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:152
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
@@ -942,14 +943,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. 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 "Général"
 
 #. 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 "Débogage"
@@ -1086,7 +1087,7 @@ msgstr "Annihiler"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Déplacement"
 
@@ -1198,7 +1199,7 @@ msgstr "Ajouter le nom dans la boite de dialogue"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1207,7 +1208,7 @@ msgstr "Ajouter le nom dans la boite de dialogue"
 #: 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
@@ -1280,7 +1281,7 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1350,7 +1351,7 @@ msgstr "Désactive la fonction Absence"
 #. 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 "Quitter"
 
@@ -1432,7 +1433,7 @@ msgstr "Ajouter tout dans l'échange"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Entreposer"
 
@@ -1811,9 +1812,8 @@ msgstr "Aller jusqu'au point de navigation"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "Touches des modificateurs de raccourcis"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2054,23 +2054,45 @@ msgid "Next Social Tab"
 msgstr "Onglet de dialogue suivant"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Onglet de dialogue précédent"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Touche de raccourcis objets"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Onglet de conversation précédent"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Onglet de conversation suivant"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr "Touches des modificateurs d'émoticône"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr "Touche du modificateur d'émoticône"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 msgid "Emote shortcuts"
 msgstr "Raccourcis des émoticônes"
 
 #. 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
@@ -2093,38 +2115,38 @@ msgstr "Raccourcis des émoticônes"
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Raccourci d'émoticône %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr "Touches des tenues"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Mettre la tenue"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Copier la tenue"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Copier l'équipement porté dans les tenues"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 msgid "Outfits shortcuts"
 msgstr "Raccourcis des tenues"
 
 #. 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
@@ -2147,228 +2169,228 @@ msgstr "Raccourcis des tenues"
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr "Raccourci de tenue %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Afficher / Cacher le chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Défiler le chat vers le haut"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Défiler le chat vers le bas"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Onglet de conversation précédent"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Onglet de conversation suivant"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Fermer l'onglet de dialogue courant"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Ligne de conversation précédente"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Ligne de conversation suivante"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr "Touche de modification du chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Ignorer l'entrée 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Vers le haut"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Vers le bas"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Vers la gauche"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Vers la droite"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Mouvements fous"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Changer le mode de Mouvements Fous"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Jeter rapidement N objets depuis l'emplacement 0"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Jeter rapidement N objets"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Changer le compteur de jet rapide d'objets"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Soins rapides de la cible ou de soi-même"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Utiliser le sort #itenplz"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Utiliser l'attaque magique"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Changer d'attaque magique"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr "Commutateur d'attaque en PVP"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Changer de type de mouvement"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Changer de type d'arme d'attaque"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Changer de type d'attaque"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Changer de type de suivi"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Changer de type d'imitation"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr "Désactiver / Activer les touches de modifications du jeu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "Son On / Off"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Activer / Désactiver le mode en absence"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Emuler le clic droit à partir du clavier"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "Changer le mode caméra"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr "Afficher le clavier d'écran"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr "Touches de déplacement"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Monter"
 
 #. 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 Down"
 msgstr "Descendre"
 
 #. 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 Left"
 msgstr "Aller à gauche"
 
 #. 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 Right"
 msgstr "Aller à droite"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr "Aller devant"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr "Raccourcis de \"Aller au point de navigation\""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2391,32 +2413,34 @@ msgstr "Raccourcis de \"Aller au point de navigation\""
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr "Raccourci de \"Aller au point de navigation\" %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr "Déplacement & sélection"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr "Aller au point de repos"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr "Arrêt du déplacement"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr "Page précédente"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr "Page suivante"
 
@@ -2425,7 +2449,7 @@ msgstr "Page suivante"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2436,12 +2460,12 @@ msgid "Other"
 msgstr "Autre"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr "Sélectionner"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr "Sélectionner2"
 
@@ -2451,7 +2475,7 @@ msgstr "Sélectionner2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2460,45 +2484,45 @@ msgid "Delete"
 msgstr "Supprimer"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr "Retour arrière"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr "Insérer"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr "Tab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr "Modif."
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr "Ctrl"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr "Basique"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "Fenêtres"
@@ -2506,7 +2530,7 @@ msgstr "Fenêtres"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr "Emoticônes"
@@ -2514,13 +2538,13 @@ msgstr "Emoticônes"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Conversation"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr "Interface utilisateur (IU)"
 
@@ -2851,13 +2875,13 @@ msgid "%s whispers: %s"
 msgstr "Message de %s : %s"
 
 #. 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 "%s est maintenant En Ligne."
 
 #. 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 "%s est maintenant Hors Ligne."
@@ -2880,7 +2904,7 @@ msgstr "Guilde"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "Commande : /invite <nom du personnage>"
 
@@ -2894,7 +2918,7 @@ msgstr "Cette commande invite <nom du personnage> à rejoindre ton groupe."
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Si le <nom du personnage> contient des espaces, entoure-le de guillemets "
@@ -2904,7 +2928,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "Commande : /leave"
 
@@ -2917,26 +2941,26 @@ msgstr "Cette commande te fait quitter la guilde actuelle."
 #. 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > Affiche cette aide."
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Invite un joueur à rejoindre ta guilde"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Quitter la guilde courante"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr "/kick > Virer quelqu'un de la guilde dont tu fais partie"
 
@@ -4738,49 +4762,49 @@ msgid "Allow screensaver to run"
 msgstr "Autoriser l'économiseur d'écran à fonctionner"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignore le joueur"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Cesse d'ignorer le joueur"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Ferme l'onglet de conversation privée"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Commande : /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Cette commande ferme l'onglet de conversation privée courant."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Commande : /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Cette commande permet d'ignorer un joueur indépendamment des relations "
 "actuelles."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Cette commande te fait cesser d'ignorer un joueur si c'était le cas."
 
@@ -5065,7 +5089,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 "Créer"
 
@@ -6144,12 +6168,12 @@ msgid "requires v%s"
 msgstr "requiert la v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Appliquer"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
@@ -6365,135 +6389,135 @@ msgstr "Amis : %u/%u"
 
 #. 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 "Créer un groupe"
 
 #. 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 "P"
 
 #. 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 "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/socialwindow.cpp:1302
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Choisis le nom de la guilde."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
 "membre d'une autre."
 
 #. 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 "%s t'a invité à rejoindre la guilde %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
 "membre d'une autre."
 
 #. 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 "Vous avez été invité à rejoindre un groupe."
 
 #. 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 "Tu as été invité à rejoindre le groupe %s."
 
 #. 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 "%s t'a invité à rejoindre son groupe."
 
 #. 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 "%s t'a invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossible de créer le groupe. vous faîtes déjà partie d'un groupe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Nom du groupe"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Choisis le nom du groupe."
 
@@ -7112,51 +7136,51 @@ msgid "Guild castle: %s"
 msgstr "Château de la guilde : %s"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invite un joueur à rejoindre ton groupe"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Quitte le groupe dans lequel tu te trouves"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr "/kick > Virer quelqu'un de la guilde dont tu fais partie"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "Cette commande invite <nom du personnage> à rejoindre ton groupe."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "Cette commande te fait quitter ton groupe actuel."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Commande : /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "Cette commande change les préférences d'échange d'objet du groupe."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7165,30 +7189,30 @@ msgstr ""
 "d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Commande : /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Cette commande affiche les préférences actuelles du groupe sur le partage "
 "d'objet."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "Commande : /exp <policy>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 "Cette commande change les préférences du groupe sur le partage d'expérience."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7197,12 +7221,12 @@ msgstr ""
 "d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "Commande : /exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Cette commande affiche les préférences actuelles du groupe sur le partage "
@@ -7210,47 +7234,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Partage d'objet activé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Partage d'objet désactivé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Paramètre de partage d'objets inconnu."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr "Paramètre de partage d'expérience inconnu."
 
@@ -8053,9 +8077,3 @@ msgstr "Objet inconnu"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr "familier"
-
-#~ msgid "Stop Attack"
-#~ msgstr "Arrêter d'attaquer"
-
-#~ msgid "Modifier key"
-#~ msgstr "Modifier la touche"
diff --git a/po/he.po b/po/he.po
index 9f886b91e..030847141 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -537,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 "וידאו"
 
@@ -660,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 ""
@@ -682,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 ""
 
@@ -887,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 ""
 
@@ -941,23 +941,23 @@ 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 "שגיאת רשת"
 
@@ -1071,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1183,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1265,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1417,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/setup.cpp:94
 msgid "Store"
 msgstr "אחסן"
 
@@ -1482,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 "השתמש"
 
@@ -1673,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 "הורד"
 
@@ -1684,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 "השתמש"
 
@@ -1692,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 ""
 
@@ -1707,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 "השלך"
 
@@ -1796,8 +1796,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "הפסק לתקוף"
+msgid "Stop Attack / Modifier key"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2312,100 +2312,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr "הזז למעלה"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr "הזז למטה"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr "הזז שמאלה"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr "הזז ימינה"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2409,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2420,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2435,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:1803 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
@@ -2449,45 +2444,45 @@ msgid "Delete"
 msgstr "מחק"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2490,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2498,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2727,7 +2722,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
@@ -4370,8 +4365,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 "טען מחדש כדי שהשינוי יחול."
 
@@ -4458,106 +4453,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 "אישור שינויים עבור OpenGL דורש איתחול."
 
 #. 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 ""
 
@@ -4822,7 +4817,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 "לבוש"
diff --git a/po/hr.po b/po/hr.po
index 0a75c9244..a62e596bc 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -538,7 +538,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 "Slika"
 
@@ -661,7 +661,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 ""
@@ -683,7 +683,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 ""
 
@@ -888,25 +888,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 ""
 
@@ -942,23 +942,23 @@ 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 "Spremanje screenshot-a nije uspjelo!"
 
 #. 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 "Mreža Greška"
 
@@ -1072,7 +1072,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1184,7 +1184,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1266,7 +1266,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1418,7 +1418,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/setup.cpp:94
 msgid "Store"
 msgstr "Pohrani"
 
@@ -1483,7 +1483,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 "Upotrijebi"
 
@@ -1674,9 +1674,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 "Skini opremu"
 
@@ -1685,7 +1685,7 @@ msgstr "Skini opremu"
 #. 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 "Opremi"
 
@@ -1693,7 +1693,7 @@ msgstr "Opremi"
 #. 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 ""
 
@@ -1708,7 +1708,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 "Ispusti"
 
@@ -1797,8 +1797,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Prekini Napad"
+msgid "Stop Attack / Modifier key"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2313,100 +2313,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr "Pomakni Gore"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr "Pomakni Dolje"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr "Pomakni Ulijevo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr "Pomakni Udesno"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2415,7 +2410,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2426,12 +2421,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2441,7 +2436,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:1803 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
@@ -2450,45 +2445,45 @@ msgid "Delete"
 msgstr "Obriši"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2496,7 +2491,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2504,13 +2499,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:1922 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
 msgid "Gui"
 msgstr ""
 
@@ -2728,7 +2723,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
@@ -4371,8 +4366,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 "Ponovo pokrenite klijent da bi promjene bile efektne."
 
@@ -4459,106 +4454,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 "Pregled na čitavom ekranu"
 
 #. 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 "Vlastiti kursor"
 
 #. 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 "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
 #. 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 "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
 #. 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 ""
 
@@ -4823,7 +4818,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 "Oprema"
diff --git a/po/hu.po b/po/hu.po
index 2fddd3b07..7dbd10ae7 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -537,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 "Videó"
 
@@ -660,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 ""
@@ -682,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 ""
 
@@ -887,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 ""
 
@@ -941,23 +941,23 @@ 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 "Hiba a képernyő mentése során!"
 
 #. 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 "Hálózati hiba"
 
@@ -1071,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1183,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1265,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1417,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/setup.cpp:94
 msgid "Store"
 msgstr "Raktároz"
 
@@ -1482,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 "Bevet"
 
@@ -1673,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 "Nem használ"
 
@@ -1684,7 +1684,7 @@ msgstr "Nem használ"
 #. 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 "Használ"
 
@@ -1692,7 +1692,7 @@ msgstr "Használ"
 #. 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 ""
 
@@ -1707,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 "Eldob"
 
@@ -1796,8 +1796,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Támadás Megszüntetése"
+msgid "Stop Attack / Modifier key"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2312,100 +2312,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr "Mozgás felfelé"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr "Mozgás lefelé"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr "Mozgás balra"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr "Mozgás jobbra"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2409,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2420,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2435,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:1803 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
@@ -2449,45 +2444,45 @@ msgid "Delete"
 msgstr "Törlés"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2490,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2498,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:1922 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
 msgid "Gui"
 msgstr ""
 
@@ -2727,7 +2722,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
@@ -4370,8 +4365,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 "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
@@ -4458,106 +4453,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 "Teljes képernyő"
 
 #. 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 "Egyéni kurzor"
 
 #. 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 "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
 #. 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 "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
 #. 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 ""
 
@@ -4822,7 +4817,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 "Felszerelés"
diff --git a/po/id.po b/po/id.po
index 8574e1256..c59f376e2 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: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
 "language/id/)\n"
@@ -527,7 +527,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 "Pengaturan"
 
@@ -743,7 +744,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:152
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan"
 
@@ -933,14 +934,14 @@ 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 "Umum"
 
 #. 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 "Debug"
@@ -1076,7 +1077,7 @@ msgstr "Sembunyikan"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Jalan"
 
@@ -1188,7 +1189,7 @@ msgstr "Tambahkan nama ke Obrolan"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1197,7 +1198,7 @@ msgstr "Tambahkan nama ke Obrolan"
 #: 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
@@ -1270,7 +1271,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1340,7 +1341,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 ""
 
@@ -1422,7 +1423,7 @@ msgstr "Tambahkan semua ke Penukaran"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Simpan"
 
@@ -1801,9 +1802,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "Kunci pengubah"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2044,23 +2044,43 @@ msgid "Next Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Garis obrolan sebelumnya"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+msgid "Next Shortcuts tab"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+msgid "Previous Commands tab"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Perintah"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 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
@@ -2083,38 +2103,38 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Salin barang-barang yang dipakai ke Setelan"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 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
@@ -2137,228 +2157,228 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Tutup tab obrolan ini"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Garis obrolan sebelumnya"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Garis obrolan selanjutnya"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 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 Down"
 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 Left"
 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 Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2381,32 +2401,34 @@ msgstr ""
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr ""
 
@@ -2415,7 +2437,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2426,12 +2448,12 @@ msgid "Other"
 msgstr "Lainnya"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr ""
 
@@ -2441,7 +2463,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2450,45 +2472,45 @@ msgid "Delete"
 msgstr "Hapus"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2496,7 +2518,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2504,13 +2526,13 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Obrolan"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr ""
 
@@ -2841,13 +2863,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 ""
@@ -2870,7 +2892,7 @@ msgstr "Organisasi"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr ""
 
@@ -2884,7 +2906,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jika <nama> mempunyai spasi, ditutup dengan tanda (\")."
 
@@ -2892,7 +2914,7 @@ msgstr "Jika <nama> mempunyai spasi, ditutup dengan tanda (\")."
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr ""
 
@@ -2905,26 +2927,26 @@ 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4710,47 +4732,47 @@ msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "perintah: /unignore <nama pemain>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -5035,7 +5057,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 "Buat"
 
@@ -6107,12 +6129,12 @@ msgid "requires v%s"
 msgstr "Membutuhkan v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Terapkan"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
@@ -6328,131 +6350,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 ""
 
@@ -7061,136 +7083,136 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "perintah ini mengundang <nama> untuk menjadi bagian kelompok anda"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 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
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 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
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 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:179 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:183 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:187 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:191
 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:223 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:227 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:231 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:235
 msgid "Experience sharing unknown."
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 29001c15f..3f7f792ce 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
 "language/it/)\n"
@@ -532,7 +532,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 "Impostazioni"
 
@@ -748,7 +749,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:152
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
@@ -939,14 +940,14 @@ 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 "Generale"
 
 #. 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 "Debug"
@@ -1082,7 +1083,7 @@ msgstr "Nascondi"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Movimento"
 
@@ -1194,7 +1195,7 @@ msgstr "Aggiungi nome alla chat"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1203,7 +1204,7 @@ msgstr "Aggiungi nome alla chat"
 #: 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
@@ -1276,7 +1277,7 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1346,7 +1347,7 @@ msgstr "Disabilita modalita' Away"
 #. 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 "Lascia"
 
@@ -1428,7 +1429,7 @@ msgstr "Aggiungi tutti"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Magazzino"
 
@@ -2049,23 +2050,45 @@ msgid "Next Social Tab"
 msgstr "Social Tab successivo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Social Tab precedente"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Pulsante Scorciatoie Oggetti"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Scheda Chat Precedente"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Scheda Chat Successiva"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 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
@@ -2088,38 +2111,38 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Scorciatoia Emote %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Equipaggia Combinazione"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Copia Combinazione"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 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
@@ -2142,228 +2165,228 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Attiva Chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Scorre la chat in alto"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Scorre la chat in basso"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Scheda Chat Precedente"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Scheda Chat Successiva"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Chiudi il Chat Tab corrente"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Riga Chat precedente"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Riga Chat successiva"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Ignora input 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Ignora input 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Direzione Su"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Direzione Giù"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Direzione Sinistra"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Direzione Destra"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Movimenti casuali"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Cambia modalità Movimenti Casuali"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Cura velocemente il target o se stesso"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Usa magia #itenplz"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Usa attacco magico"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Cambia attacco magico"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr "Cambia attacco PVP"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Cambia mossa speciale"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Cambia tipologia Arma d'attacco"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Cambia tipologia d'attacco"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Cambia modalità Segui"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Cambia modalità Imitazione"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "On / Off audio"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Abilita / Disabilita modalità away"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Emula da tastiera click destro"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "Cambia Visuale"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr "Mostra tastiera su schermo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr "Tasti Movimento"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Muoviti verso l'alto"
 
 #. 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 Down"
 msgstr "Muoviti verso il basso"
 
 #. 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 Left"
 msgstr "Muoviti verso sinistra"
 
 #. 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 Right"
 msgstr "Muoviti verso destra"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2386,32 +2409,34 @@ msgstr ""
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr "Page up"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr "Page down"
 
@@ -2420,7 +2445,7 @@ msgstr "Page down"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2431,12 +2456,12 @@ msgid "Other"
 msgstr "Altro"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr "Seleziona"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr ""
 
@@ -2446,7 +2471,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2455,45 +2480,45 @@ msgid "Delete"
 msgstr "Elimina"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr "Insert"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr "Tab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr "Base"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "Finestre"
@@ -2501,7 +2526,7 @@ msgstr "Finestre"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr "Faccine"
@@ -2509,13 +2534,13 @@ msgstr "Faccine"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr ""
 
@@ -2846,13 +2871,13 @@ msgid "%s whispers: %s"
 msgstr "%s sussurra: %s "
 
 #. 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 ""
@@ -2875,7 +2900,7 @@ msgstr "Gilda"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr ""
 
@@ -2889,7 +2914,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
 
@@ -2897,7 +2922,7 @@ msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
@@ -2910,26 +2935,26 @@ msgstr "Questo comando permette fa lasciare al giocatore la gilda."
 #. 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4723,48 +4748,48 @@ msgid "Allow screensaver to run"
 msgstr "Permetti allo screensaver di attivarsi"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora l'altro giocatore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Smetti di ignorare l'altro giocatore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Chiude la scheda del sussurro"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Comando: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Questo comando chiude la scheda del sussurro attiva."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Comando: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Questo comando ignora l'altro giocatore, senza tenere conto delle relazioni"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <giocatore>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 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 "
@@ -5051,7 +5076,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 "Crea"
 
@@ -6125,12 +6150,12 @@ msgid "requires v%s"
 msgstr "Richiede v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Applica"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
@@ -6346,131 +6371,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 "Crea gruppo"
 
 #. 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 "P"
 
 #. 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 "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/socialwindow.cpp:1302
 msgid "Invite"
 msgstr "Invita"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accettato invito al gruppo da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rifiutato invito al gruppo da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accettato invito alla gilda da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rifiutato invito alla gilda da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Stai creando una gilda chiamata %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Stai creando un party chiamato %s"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Nome della gilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Scegli un nome per la tua gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
 
 #. 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 "%s ti ha invitato ad entrare nella gilda %s"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Accetta invito alla gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
 #. 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 "Sei stato invitato ad entrare in un party"
 
 #. 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 "Sei stato invitato ad entrare nel gruppo %s"
 
 #. 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 "%s ti ha invitato ad unirti al suo party."
 
 #. 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 "%s ti ha invitato ad unirti al party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossibile creare un party, sei già in un party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Nome del gruppo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party"
 
@@ -7084,136 +7109,136 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invita un giocatore nel tuo Party"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Lascia il Party"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Mostra/cambia opzioni gestione oggetti in comune"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Mostra/cambia opzioni gestione esperienza in comune"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "Questo comanda aggiunge <nick> al tuo Party."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Comando: /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 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
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Comando: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <policy>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 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
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 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:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Gestione in comune oggetti attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Gestione in comune oggetti disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "Gestione in comune oggetti non puo' essere attivata."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Oggetti in comune sconosciuti"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Esperienza in comune attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Esperienza in comune disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "Esperienza in comune non puo' essere attivata."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr "Esperienza in comune sconosciuta"
 
@@ -8014,6 +8039,3 @@ msgstr "Oggetto sconosciuto"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "Ferma attacco"
diff --git a/po/ja.po b/po/ja.po
index 71508dad1..9b09a53ec 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -530,7 +530,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 "設定"
 
@@ -746,7 +747,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:152
 msgid "Party name is missing."
 msgstr "パーティ名がありません"
 
@@ -936,14 +937,14 @@ 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 "デバッグ"
@@ -1079,7 +1080,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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "動く"
 
@@ -1191,7 +1192,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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1200,7 +1201,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
@@ -1273,7 +1274,7 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1343,7 +1344,7 @@ msgstr "AFKを無効にする"
 #. 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 "退会"
 
@@ -1425,7 +1426,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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "保管"
 
@@ -1804,9 +1805,8 @@ msgstr "ナビゲーションポイントへ移動"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "ショートカット編集キー"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2047,23 +2047,45 @@ msgid "Next Social Tab"
 msgstr "次ソーシャルタブ"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "前ソーシャルタブ"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "アイテムショートカットキー"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "前のチャットタブ"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "次のチャットタブ"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr "スマイリー編集キー"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr "スマイリー編集キー"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 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
@@ -2086,38 +2108,38 @@ msgstr "スマイリーショートカット"
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "スマイリーショートカット: %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr "服装キー"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "服を着る"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "服をコピーする"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "装着品を服装にコピー"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 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
@@ -2140,228 +2162,228 @@ msgstr "服装ショートカット"
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr "服装ショートカット %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "トグルチャット"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "チャットを上へスクロールする"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "チャットを下へスクロールする"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "前のチャットタブ"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "次のチャットタブ"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "このチャットタブを閉じる"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "前チャット文"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "次チャット文"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "インプット１完全無視"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "インプット２完全無視"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "上方向"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "下方向"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "左方向"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "右方向"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "クレイジームーブ"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "クレイジームーブモード変更"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Nアイテムを 0スロットからクイックドロップ"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Nアイテムをクイックドロップ"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "クイックドロップカウンター変更"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "ターゲット又は自分をHP回復させる"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "呪文 #itenplz を唱える"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "魔法攻撃を使用"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "マジックアタック変更"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr "PvP攻撃変更"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "ムーブタイプ変更"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "武器変更"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "攻撃方法変更"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "フォローモード変更"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "真似モード変更"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr "ゲームモディファイアキーを無効 / 有効にする"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "オーディオ　オン/オフ"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "AFKモードを有効 / 無効にする"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "右クリックをエミュレートする"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "カメラモード変更"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr "オンスクリーンキーボード"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr "キーを移動"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 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 Down"
 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 Left"
 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 Right"
 msgstr "右へ移動"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr "ナビポイントショートカットまで移動"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2384,32 +2406,34 @@ msgstr "ナビポイントショートカットまで移動"
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr "ショートカット %dまで移動"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr "ホームへ移動"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr "最後まで移動"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr "ページ上へ"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr "ページ下へ"
 
@@ -2418,7 +2442,7 @@ msgstr "ページ下へ"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2429,12 +2453,12 @@ msgid "Other"
 msgstr "その他"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr "選択"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr "選択2"
 
@@ -2444,7 +2468,7 @@ msgstr "選択2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2453,45 +2477,45 @@ msgid "Delete"
 msgstr "削除"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr "バックスペース"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr "挿入"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr "タブ"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr "モッド"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr "基本"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "ウィンドウ"
@@ -2499,7 +2523,7 @@ msgstr "ウィンドウ"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr "スマイリー"
@@ -2507,13 +2531,13 @@ msgstr "スマイリー"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 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:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr "GUI"
 
@@ -2844,13 +2868,13 @@ msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
 #. 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 ""
@@ -2873,7 +2897,7 @@ msgstr "ギルド"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "コマンド: /invite <プレイヤー名>"
 
@@ -2887,7 +2911,7 @@ msgstr "このコマンドは、入力したプレイヤーを自分のギルド
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "入力するニックネームにスペースが含まれている場合はダブルコーテーション(\"\")"
@@ -2897,7 +2921,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "コマンド: /leave"
 
@@ -2910,26 +2934,26 @@ 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > ヘルプメニューを表示"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > プレイヤーをギルドへ招待する"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > ギルドから退会する"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4717,47 +4741,47 @@ msgid "Allow screensaver to run"
 msgstr "スクリーンセーバーを有効にする"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > 他のプレイヤーを完全無視する"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore はプレイヤー無視を解除をします"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/closeでささやきタブを閉じます"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "コマンド: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "このコマンドは現在開いているささやきタブを閉じます"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "コマンド: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr "このコマンドは全てのプレイヤーを完全無視します"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "コマンド: /unignore <プレイヤー名>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "このコマンドはプレイヤー完全無視を解除します"
 
@@ -5042,7 +5066,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 "作成"
 
@@ -6114,12 +6138,12 @@ msgid "requires v%s"
 msgstr "v%sが必要"
 
 #. 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 "ウィンドウをリセットする"
 
@@ -6335,131 +6359,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 "%sからのパーティ招待を承認しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド %sを作成しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "パーティ %sを作成しました"
 
 #. 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 "%sがギルド %sへ招待しています"
 
 #. 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 "パーティ %sに招待されました"
 
 #. 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 "%sはあなたをパーティに招待しました"
 
 #. 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 "%sはあなたを%sというパーティに招待しました"
 
 #. 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 "パーティ名を選んでください"
 
@@ -7075,51 +7099,51 @@ msgid "Guild castle: %s"
 msgstr "ギルド城: %s"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite パーティにプレイヤーを招待する"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave パーティから退会する"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item パーティ内でアイテム共有モードを表示/変更する"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp でパーティ内のExpシェアモードを表示/変更する"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "このコマンドは入力したプレイヤーを自分のパーティーに招待します"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "このコマンドはパーティからプレイヤーを退会させます"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "コマンド: /item <ポリシー>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "このコマンドはアイテム共有モードを変更します"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7128,27 +7152,27 @@ msgstr ""
 "無効にするには\"0\", \"no\", \"false\"と入力して下さい"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "コマンド: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr "このコマンドはアイテム共有モードを表示します"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "コマンド: /exp <ポリシー>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr "このコマンドはExpシェアモードを変更します"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7157,58 +7181,58 @@ msgstr ""
 "にするには\"0\", \"no\", \"false\"と入力して下さい"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "コマンド: /exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr "このコマンドはパーティメンバーのExpシェアモードを表示します"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 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:183 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:187 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:191
 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:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Expシェアモード有効"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Expシェアモード無効"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "Expシェアモード不可能"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr "Expシェアモード不明"
 
@@ -8004,9 +8028,3 @@ msgstr "不明なアイテム"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "攻撃を止める"
-
-#~ msgid "Modifier key"
-#~ msgstr "モディファイアキー"
diff --git a/po/ka.po b/po/ka.po
index 8c459c9fd..53bb0a505 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -536,7 +536,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 +659,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 +681,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 ""
 
@@ -886,25 +886,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 ""
 
@@ -940,23 +940,23 @@ 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 +1070,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1182,7 +1182,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1264,7 +1264,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1416,7 +1416,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1481,7 +1481,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 +1672,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 +1683,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 +1691,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 +1706,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 +1795,7 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
@@ -2311,100 +2311,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2413,7 +2408,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:1779 src/gui/setupactiondata.h:1924
 #: 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 +2419,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2439,7 +2434,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:1803 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 +2443,45 @@ msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2494,7 +2489,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2502,13 +2497,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2726,7 +2721,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
@@ -4369,8 +4364,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 +4452,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 ""
 
@@ -4821,7 +4816,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 ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index ec8540348..031b6964c 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: 2014-02-01 12:07+0300\n"
+"POT-Creation-Date: 2014-02-04 22:58+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"
@@ -525,7 +525,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 ""
 
@@ -739,7 +740,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:152
 msgid "Party name is missing."
 msgstr ""
 
@@ -928,14 +929,14 @@ 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 ""
@@ -1071,7 +1072,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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1183,7 +1184,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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1192,7 +1193,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
@@ -1265,7 +1266,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1335,7 +1336,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 ""
 
@@ -1417,7 +1418,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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -2038,23 +2039,41 @@ msgid "Next Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+msgid "Previous Shortcuts tab"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+msgid "Next Shortcuts tab"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+msgid "Previous Commands tab"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+msgid "Next Commands tab"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 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
@@ -2077,38 +2096,38 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 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
@@ -2131,228 +2150,228 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 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 Down"
 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 Left"
 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 Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2375,32 +2394,34 @@ msgstr ""
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr ""
 
@@ -2409,7 +2430,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2420,12 +2441,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr ""
 
@@ -2435,7 +2456,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2444,45 +2465,45 @@ msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2490,7 +2511,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2498,13 +2519,13 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 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:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr ""
 
@@ -2835,13 +2856,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,7 +2885,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr ""
 
@@ -2878,7 +2899,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -2886,7 +2907,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr ""
 
@@ -2899,26 +2920,26 @@ 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4704,47 +4725,47 @@ msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -5029,7 +5050,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 ""
 
@@ -6103,12 +6124,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 ""
 
@@ -6324,131 +6345,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 ""
 
@@ -7057,136 +7078,136 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 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
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 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
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 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:179 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:183 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:187 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:191
 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:223 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:227 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:231 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:235
 msgid "Experience sharing unknown."
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 156403bcc..68cc1d2b3 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -537,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 "Video"
 
@@ -660,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 ""
@@ -682,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 ""
 
@@ -887,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 ""
 
@@ -941,23 +941,23 @@ 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 "Lagring av skjermbilde feilet!"
 
 #. 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 "Nettverksfeil"
 
@@ -1071,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1183,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1265,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1417,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1482,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 "Bruk"
 
@@ -1673,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 ""
 
@@ -1684,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 ""
 
@@ -1692,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 ""
 
@@ -1707,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 ""
 
@@ -1796,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
@@ -2312,100 +2312,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2409,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2420,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2435,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:1803 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
@@ -2449,45 +2444,45 @@ msgid "Delete"
 msgstr "Slett"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2490,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2498,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2727,7 +2722,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
@@ -4370,8 +4365,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 ""
 
@@ -4458,106 +4453,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 "Fullskjerm"
 
 #. 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 "Endringer av OpenGL krever restart."
 
 #. 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 ""
 
@@ -4822,7 +4817,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 "Utstyr"
diff --git a/po/nl.po b/po/nl.po
index 68c124f5b..ce891c34a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,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-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/manaplus/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -538,7 +538,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 "Video"
 
@@ -661,7 +661,7 @@ msgstr "Vaarwel, je mag altijd terugkomen..."
 
 #. 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 "%s bestaat niet en kan niet worden aangemaakt! Sluiten."
@@ -683,7 +683,7 @@ msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet worden aangemaakt! Sluiten."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2998
+#: src/client.cpp:3000
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -888,25 +888,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 ""
 
@@ -942,23 +942,23 @@ 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 "Opslaan van screenshot mislukt!"
 
 #. 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 "Netwerkfout"
 
@@ -1072,7 +1072,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1184,7 +1184,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1266,7 +1266,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1418,7 +1418,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/setup.cpp:94
 msgid "Store"
 msgstr "Opslaan"
 
@@ -1483,7 +1483,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 "Gebruiken"
 
@@ -1674,9 +1674,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 "Afdoen"
 
@@ -1685,7 +1685,7 @@ msgstr "Afdoen"
 #. 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 "Uitrusten"
 
@@ -1693,7 +1693,7 @@ msgstr "Uitrusten"
 #. 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 ""
 
@@ -1708,7 +1708,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 "Neerleggen"
 
@@ -1797,8 +1797,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Aanval stoppen"
+msgid "Stop Attack / Modifier key"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2313,100 +2313,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr "Omlaag"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr "Naar links"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr "Naar rechts"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2415,7 +2410,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2426,12 +2421,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2441,7 +2436,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:1803 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
@@ -2450,45 +2445,45 @@ msgid "Delete"
 msgstr "Verwijderen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2496,7 +2491,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2504,13 +2499,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:1922 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
 msgid "Gui"
 msgstr ""
 
@@ -2728,7 +2723,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
@@ -4371,8 +4366,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 "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -4459,106 +4454,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 "Volledig scherm"
 
 #. 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 "Aangepaste cursor"
 
 #. 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 "De veranderingen worden pas actief na opnieuw opstarten"
 
 #. 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 "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
 #. 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 ""
 
@@ -4823,7 +4818,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 "Uitrusting"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index e0476bdc2..caf8eed3e 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -528,7 +528,8 @@ msgstr "Zwevende bel"
 #. 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 "Configureren"
 
@@ -744,7 +745,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:152
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
@@ -934,14 +935,14 @@ 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 "Algemeen"
 
 #. 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 "Debug"
@@ -1077,7 +1078,7 @@ msgstr "Nuke"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Beweeg"
 
@@ -1189,7 +1190,7 @@ msgstr "Naam aan het gesprek toevoegen"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1198,7 +1199,7 @@ msgstr "Naam aan het gesprek toevoegen"
 #: 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
@@ -1271,7 +1272,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1341,7 +1342,7 @@ msgstr "away afzetten"
 #. 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 "Verlaat"
 
@@ -1423,7 +1424,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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2044,23 +2045,45 @@ msgid "Next Social Tab"
 msgstr "Volgende Sociale Tab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Vorige Sociale Tab"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Voorwerpsnelkoppelingstoets"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Vorige chattab"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Volgende chattab"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 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
@@ -2083,38 +2106,38 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emoticon snelkoppeling %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Draag Kledij"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Kopiëer Kledij"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Kopieer je huidige uitrusting naar 'outfit'"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 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
@@ -2137,228 +2160,228 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Chat omhoogscrollen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Chat omlaagscrollen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Vorige chattab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Juist Boven"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Juist Onder"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Juist Links"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Juist Rechts"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Snel N Voorwerpen van slot 0 neerleggen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Snel N Voorwerpen Neerleggen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Wissel Snel Neerleggingsteller"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Snel jezelf of iemand anders genezen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Gebruik #itenplz spreuk"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Gebruik magie aanval"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Verander het bewegingstype"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "Aan / Uit audio"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Afwezigheidsmodus inschakelen/uitschakelen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Omhoog"
 
 #. 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 Down"
 msgstr "Omlaag"
 
 #. 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 Left"
 msgstr "Naar links"
 
 #. 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 Right"
 msgstr "Naar rechts"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2381,32 +2404,34 @@ msgstr ""
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr ""
 
@@ -2415,7 +2440,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2426,12 +2451,12 @@ msgid "Other"
 msgstr "Andere"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr ""
 
@@ -2441,7 +2466,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2450,45 +2475,45 @@ msgid "Delete"
 msgstr "Verwijderen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2496,7 +2521,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2504,13 +2529,13 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr ""
 
@@ -2841,13 +2866,13 @@ msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
 #. 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 ""
@@ -2870,7 +2895,7 @@ msgstr "Guild"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "Commando: /invite <nick>"
 
@@ -2884,7 +2909,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
@@ -2894,7 +2919,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "Commando: /leave"
 
@@ -2907,26 +2932,26 @@ 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > Geeft deze help weer."
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4718,49 +4743,49 @@ msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Negeer de andere speler"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Stop met de andere speler te negeren"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Sluit de fluistertab"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Commando: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Dit commando sluit de huidige fluistertab."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Commando: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Dit commando negeert de andere speler niettegenstaande enige huidige "
 "relaties."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Commando: /unignore <speler>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 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."
@@ -5046,7 +5071,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 "Aanmaken"
 
@@ -6120,12 +6145,12 @@ msgid "requires v%s"
 msgstr "vereist v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Toepassen"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
@@ -6341,131 +6366,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 "Groep aanmaken"
 
 #. 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 "S"
 
 #. 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 "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/socialwindow.cpp:1302
 msgid "Invite"
 msgstr "Nodig uit"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Guild Naam"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
 #. 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 "%s heeft je uitgenodigd om guid %s te vervoegen."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #. 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 "U bent uitgenodigd om je bij een groep te voegen."
 
 #. 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 "U bent uitgenodigd om je bij groep %s te voegen."
 
 #. 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 "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
 #. 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 "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Groep Naam"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -7078,51 +7103,51 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Nodig een speler uit voor jouw groep"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Verlaat de groep waarin je je bevindt"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Commando: /item <beleid>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "Dit commando wijzigt het voorwerpdelingsbeleid van de groep."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7132,28 +7157,28 @@ msgstr ""
 "\", \"false\"."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Commando: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Dit commando geeft het huidige voorwerpdelingsbeleid van de groep weer."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "Commando: /exp <beleid>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr "Dit commando wijzigt het ervaringsdelingsbeleid van de groep."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7163,59 +7188,59 @@ msgstr ""
 "\"false\", \"no\"."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "Commando: /exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Dit commando geeft het huidige ervaringsdelingbeleid van de groep weer."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Voorwerpdeling onbekend."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -8014,6 +8039,3 @@ msgstr "Onbekend voorwerp"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "Aanval stoppen"
diff --git a/po/pl.po b/po/pl.po
index 88325a353..8b3f57961 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
 "pl/)\n"
@@ -532,7 +532,8 @@ msgstr "Bąbelek nad głową"
 #. 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 "Konfiguracja"
 
@@ -747,7 +748,7 @@ msgstr "Cache opróżnione"
 
 #. 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:152
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
@@ -936,14 +937,14 @@ 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 "Ogólny"
 
 #. 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 "Debug"
@@ -1079,7 +1080,7 @@ msgstr "Wysadź w powietrze"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Podejdź"
 
@@ -1191,7 +1192,7 @@ msgstr "Wpisz do czatu"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1200,7 +1201,7 @@ msgstr "Wpisz do czatu"
 #: 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
@@ -1273,7 +1274,7 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1343,7 +1344,7 @@ msgstr "Wyłącz tryb AFK"
 #. 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 "Opuść"
 
@@ -1425,7 +1426,7 @@ msgstr "Dodaj wszystko do handlu"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Przechowaj"
 
@@ -1804,9 +1805,8 @@ msgstr "Podejdź do punktu nawigacyjnego"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "Klawisze skrótów modyfikatorów"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2047,23 +2047,45 @@ msgid "Next Social Tab"
 msgstr "Następna zakładka społeczna"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Poprzednia zakładka społeczna"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Klawisz skrótu przedmiotu"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Poprzednia zakładka czatu"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Następna zakładka czatu"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr "Klawisze modyfikatorów emotek"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr "Klawisz modyfikatora emotek"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 msgid "Emote shortcuts"
 msgstr "Skróty emotek"
 
 #. 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
@@ -2086,38 +2108,38 @@ msgstr "Skróty emotek"
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Skrót Emotki %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr "Klawisze ubioru"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Nałóż strój"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Kopiuj strój"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Skopiuj ekwipunek do stroju"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 msgid "Outfits shortcuts"
 msgstr "Skróty ubiorów"
 
 #. 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
@@ -2140,228 +2162,228 @@ msgstr "Skróty ubiorów"
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr "Skrót ubioru %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Przełącznik Czatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Przewiń czat do góry"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Przewiń czat w doł"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Poprzednia zakładka czatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Następna zakładka czatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Zamknij bieżącą zakładkę czatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Poprzedni wiersz czatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Następny wiersz czatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr "Klawisz modyfikatora czatu"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Ignoruj wprowadzenie 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Skieruj się w górę"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Skieruj się w dół"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Skieruj się w lewo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Skieruj się w prawo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Szalone ruchy"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Zmień tryb szalonych ruchów"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Szybkie upuszczenie N przedmiotów z pozycji 0"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Szybkie upuszczenie N przedmiotów"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Zmień licznik szybkiego upuszczania"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Szybkie leczenie celu lub siebie"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Użyj zaklęcia #itenplz"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Użyj magicznego ataku"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Przełącz magiczny atak"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr "Przełącz atak PvP"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Zmień tryb poruszania się"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Zmień rodzaj broni"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Zmień rodzaj ataku"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Zmień rodzaj podążania"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Zmień rodzaj imitacji"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr "Włącz/ wyłącz klawisze modyfikatorów gry"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "Włącz/ wyłącz dźwięk"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Włącz/ wyłącz tryb AFK"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Emuluj prawe kliknięcie klawiaturą"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "Przełącz tryb kamery"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr "Pokaż klawiaturę ekranową"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr "Klawisze poruszania się"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Idź do góry"
 
 #. 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 Down"
 msgstr "Idź w dół"
 
 #. 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 Left"
 msgstr "Idź w lewo"
 
 #. 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 Right"
 msgstr "Idź w prawo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr "Przejdź to punktu skrótów nawigacyjnych"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2384,32 +2406,34 @@ msgstr "Przejdź to punktu skrótów nawigacyjnych"
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr "Przejdź do punktu skrótu %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr "Ruch i wybór"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr "Home"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr "End"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr "Page up"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr "Page down"
 
@@ -2418,7 +2442,7 @@ msgstr "Page down"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2429,12 +2453,12 @@ msgid "Other"
 msgstr "Inne"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr "Wybierz"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr "Wybierz2"
 
@@ -2444,7 +2468,7 @@ msgstr "Wybierz2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2453,45 +2477,45 @@ msgid "Delete"
 msgstr "Usuń"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr "Insert"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr "Tab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr "Mod"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr "Podstawowe"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Skróty"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "Okna"
@@ -2499,7 +2523,7 @@ msgstr "Okna"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr "Emotki"
@@ -2507,13 +2531,13 @@ msgstr "Emotki"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Czat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr "GUI"
 
@@ -2844,13 +2868,13 @@ msgid "%s whispers: %s"
 msgstr "%s szepcze: %s"
 
 #. 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 "%s jest teraz Online."
 
 #. 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 "%s jest teraz Offline."
@@ -2873,7 +2897,7 @@ msgstr "Gildia"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "Polecenie: /invite <nick>"
 
@@ -2887,7 +2911,7 @@ msgstr "To polecenie zaprasza <nick> do gildii, do której należysz."
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
 
@@ -2895,7 +2919,7 @@ msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "Polecenie: /leave"
 
@@ -2908,26 +2932,26 @@ msgstr "To polecenie sprawia że gracz opuszcza gildię."
 #. 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > Pokaż tą pomoc."
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Zaproś gracza do swojej gildii"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Opuść swoją gildię"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr "/kick > Wyrzuć kogoś ze swojej gildii"
 
@@ -4720,47 +4744,47 @@ msgid "Allow screensaver to run"
 msgstr "Pozwól na włączanie się wygaszacza ekranu"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignoruj gracza"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore- Przestań ignorować gracza"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Zamyka zakładkę szeptania"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Komenda: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Komenda zamyka obecną zakładkę szeptania"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Polecenie: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr "To polecenie ignoruje gracza niezależnie od obecnych relacji."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Komenda: /unignore <gracz>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "To polecenie przerywa ignorowanie gracza, jeśli był ignorowany."
 
@@ -5045,7 +5069,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 "Utwórz"
 
@@ -6126,12 +6150,12 @@ msgid "requires v%s"
 msgstr "wymaga v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Zastosuj"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
@@ -6347,131 +6371,131 @@ msgstr "Przyjaciele: %u/%u"
 
 #. 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 "Utwórz grupę"
 
 #. 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 "V"
 
 #. 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 "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/socialwindow.cpp:1302
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Tworzenie gildii o nazwie %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Tworzenie grupy o nazwie %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Nazwa gildii"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Wybierz nazwę gildii."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
 #. 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 "%s zaprosił/a Cię do gildii %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
 #. 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 "Zostałeś/aś zaproszony/a do grupy."
 
 #. 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 "Zostałeś/aś zaproszony/a do grupy %s."
 
 #. 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 "%s zaprosił/a Cię do grupy."
 
 #. 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 "%s zaprosił/a Cię do grupy %s ."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "Nie można utworzyć grupy. Już należysz do grupy."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
@@ -7082,53 +7106,53 @@ msgid "Guild castle: %s"
 msgstr "Zamek gildii: %s"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Zaproś gracza do swojej grupy"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Opuść swoją grupę"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr "/kick > Wyrzuć kogoś z grupy"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Pokaż/zmień stan dzielenia się przedmiotami w grupie"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Pokaż/zmień ustawienia grupy dotyczące dzielenia się punktami "
 "doświadczenia"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "To polecenie zaprasza <nick>  do Twojej drużyny."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "To polecenie sprawia, że gracz opuszcza grupę."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Polecenie: /item <zasada>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "To polecenie zmienia zasady dzielenia się przedmiotami w grupie."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7137,31 +7161,31 @@ msgstr ""
 "\"0\", \"no\", \"false\" aby je wyłączyć."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Polecenie: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "To polecenie pokazuje aktualny stan zasad dzielenia się przedmiotami w "
 "grupie."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "Polecenie: /exp <zasada>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 "To polecenie zmienia aktualny stan zasad dzielenia się punktami "
 "doświadczenia w grupie."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7170,12 +7194,12 @@ msgstr ""
 "punktami doświadczenia, \"0\", \"no\", \"false\" żeby je wyłączyć."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "Polecenie: /exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "To polecenie pokazuje aktualny stan zasad dzielenia się punktami "
@@ -7183,49 +7207,49 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Włączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Wyłączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "Nie można włączyć dzielenia się przedmiotami."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Stan dzielenia się przedmiotami nieznany."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Podział doświadczenia włączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Podział doświadczenia wyłączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr ""
 "Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica "
 "poziomów jest większa niż 10."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr "Nieznany stan podziału doświadczenia."
 
@@ -8028,9 +8052,3 @@ msgstr "Nieznany przedmiot"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "Zatrzymaj Atak"
-
-#~ msgid "Modifier key"
-#~ msgstr "Klawisz modyfikatora"
diff --git a/po/pt.po b/po/pt.po
index 8ffb4a741..5473b0440 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
 "language/pt/)\n"
@@ -529,7 +529,8 @@ msgstr "Bolha Flutuante"
 #. 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 "Configurar"
 
@@ -745,7 +746,7 @@ msgstr "Cache limpo"
 
 #. 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:152
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
@@ -935,14 +936,14 @@ 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 "Geral"
 
 #. 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 "Depurador"
@@ -1078,7 +1079,7 @@ msgstr "Desaparecer"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Mover"
 
@@ -1190,7 +1191,7 @@ msgstr "Adicionar nome ao chat"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1199,7 +1200,7 @@ msgstr "Adicionar nome ao chat"
 #: 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
@@ -1272,7 +1273,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1342,7 +1343,7 @@ msgstr "Desabilitar longe do teclado"
 #. 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 "Sair"
 
@@ -1424,7 +1425,7 @@ msgstr "Add. todos na negociação"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Armazenar"
 
@@ -1803,9 +1804,8 @@ msgstr "Mover para ponto de navegação"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "Atalhos de teclas midificadoras"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2046,23 +2046,45 @@ msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Aba social anterior"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Atalhos de item"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Aba de chat anterior"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Próxima aba de chat"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr "Teclas de modificadores de emoções"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr "Tecla modificador de emoção"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 msgid "Emote shortcuts"
 msgstr "Atalhos de emoções"
 
 #. 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
@@ -2085,38 +2107,38 @@ msgstr "Atalhos de emoções"
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para emoticon %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr "Teclas de roupas"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 msgid "Outfits shortcuts"
 msgstr "Atalhos de roupas"
 
 #. 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
@@ -2139,228 +2161,228 @@ msgstr "Atalhos de roupas"
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr "Atalho de roupa: %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr "Teclas de modificadores de chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Para cima"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Para baixo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Para esquerda"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Para direita"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo(a)"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr "Trocar ataque de pvp"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr "Mostrar teclado na tela"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr "Teclas de movimento"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Mover para Cima"
 
 #. 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 Down"
 msgstr "Mover para Baixo"
 
 #. 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 Left"
 msgstr "Esquerda"
 
 #. 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 Right"
 msgstr "Direita"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr "Atalho para mover para ponto de navegação"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2383,32 +2405,34 @@ msgstr "Atalho para mover para ponto de navegação"
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr "Mover para ponto %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr "Move & Seleção"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr "Mover para Home"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr "Mover para End"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr "Page up"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr "Page down"
 
@@ -2417,7 +2441,7 @@ msgstr "Page down"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2428,12 +2452,12 @@ msgid "Other"
 msgstr "Outro"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr "Selecionar"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr "Selecionar2"
 
@@ -2443,7 +2467,7 @@ msgstr "Selecionar2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2452,45 +2476,45 @@ msgid "Delete"
 msgstr "Excluir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr "Inserir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr "Tab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr "Mod"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Atalhos"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "Janelas"
@@ -2498,7 +2522,7 @@ msgstr "Janelas"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr "Emoções"
@@ -2506,13 +2530,13 @@ msgstr "Emoções"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr "Gui"
 
@@ -2843,13 +2867,13 @@ msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. 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 "%s está online"
 
 #. 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 "%s está offline"
@@ -2872,7 +2896,7 @@ msgstr "Guilda"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "Comando: /invite <nick>"
 
@@ -2886,7 +2910,7 @@ msgstr "Este comando convida <nick> para a guilda em que você está."
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
 
@@ -2894,7 +2918,7 @@ msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
@@ -2907,26 +2931,26 @@ msgstr "Este comando faz com que o jogador saia da guilda."
 #. 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > Exibe esta ajuda."
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Convida um jogador para a sua guilda"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Sai da guilda em que você está"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4718,47 +4742,47 @@ msgid "Allow screensaver to run"
 msgstr "Permitir proteção de tela"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Para de ignorar o outro jogador"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Fecha a aba de mensagem privada"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Comando: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Este comando fecha a atual aba de mensagem privada"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Comando: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Este comando ignora o outro jogador."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 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."
@@ -5044,7 +5068,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 "Criar"
 
@@ -6123,12 +6147,12 @@ msgid "requires v%s"
 msgstr "requer v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Aplicar"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
@@ -6344,131 +6368,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 "Criar grupo"
 
 #. 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 "J"
 
 #. 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 "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/socialwindow.cpp:1302
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. 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 "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. 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 "Você foi convidado(a) para entrar em um grupo."
 
 #. 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 "Você foi convidado(a) para entrar no grupo %s."
 
 #. 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 "%s te convidou para entrar em seu grupo."
 
 #. 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 "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -7083,52 +7107,52 @@ msgid "Guild castle: %s"
 msgstr "Castelo Guilda : %s"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Convida um jogador para o seu grupo"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Sai do grupo em que você está"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Mostra/Muda opções de compartilhamento de itens do grupo"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "Este comando convida <nick> para o seu grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "Este comando faz com que o jogador saia do grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Comando> /item <opção>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de itens do grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7137,28 +7161,28 @@ msgstr ""
 "de itens, ou \"0\", \"no\" e \"false\" para desabilitar."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Comando: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de itens do grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <policy>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7167,59 +7191,59 @@ msgstr ""
 "de experiência, ou \"0\", \"no\" e \"false\" para desabilitar."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
@@ -8022,9 +8046,3 @@ msgstr "Item desconhecido"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "Parar ataque"
-
-#~ msgid "Modifier key"
-#~ msgstr "Modificar chave"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 918cc7c8d..711ad35c4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "manaplus/language/pt_BR/)\n"
@@ -535,7 +535,8 @@ msgstr "Bolha Flutuante"
 #. 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 "Configurar"
 
@@ -751,7 +752,7 @@ msgstr "Cache limpo"
 
 #. 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:152
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
@@ -941,14 +942,14 @@ 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 "Geral"
 
 #. 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 "Depurador"
@@ -1084,7 +1085,7 @@ msgstr "Desaparecer"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Mover"
 
@@ -1196,7 +1197,7 @@ msgstr "Adicionar nome ao chat"
 #: 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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1205,7 +1206,7 @@ msgstr "Adicionar nome ao chat"
 #: 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
@@ -1278,7 +1279,7 @@ msgstr "Mover câmera "
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1348,7 +1349,7 @@ msgstr "Desabilitar modo indisponível"
 #. 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 "Sair"
 
@@ -1430,7 +1431,7 @@ msgstr "Add. todos na negociação"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Armazenar"
 
@@ -1809,9 +1810,8 @@ msgstr "Mover para ponto de navegação"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "Teclas de atalho modificadoras"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2052,23 +2052,45 @@ msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Aba social anterior"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Atalhos de item"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Aba de chat anterior"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Próxima aba de chat"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr "Teclas de emoções modificadoras"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr "Tecla modificadora de emoção"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 msgid "Emote shortcuts"
 msgstr "Atalhos de emoções"
 
 #. 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
@@ -2091,38 +2113,38 @@ msgstr "Atalhos de emoções"
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para emoticon %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr "Teclas de roupas"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 msgid "Outfits shortcuts"
 msgstr "Atalhos de Roupas"
 
 #. 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
@@ -2145,228 +2167,228 @@ msgstr "Atalhos de Roupas"
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr "Atalho de Roupa %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr "Tecla modificadora de chat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Para cima"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Para baixo"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Para esquerda"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Para direita"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo(a)"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr "Mudar ataque em pvp"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr "Mostrar teclado virtual"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr "Tecla de movimento"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Mover para Cima"
 
 #. 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 Down"
 msgstr "Mover para Baixo"
 
 #. 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 Left"
 msgstr "Esquerda"
 
 #. 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 Right"
 msgstr "Direita"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr "Atalhos de ponto de navegação"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2389,32 +2411,34 @@ msgstr "Atalhos de ponto de navegação"
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr "Mover para o atalho %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr "Move & seleção"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr "Mover para Home"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr "Mover para End"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr "Page up"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr "Page down"
 
@@ -2423,7 +2447,7 @@ msgstr "Page down"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2434,12 +2458,12 @@ msgid "Other"
 msgstr "Outro"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr "Selecionar"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr "Selecionar2"
 
@@ -2449,7 +2473,7 @@ msgstr "Selecionar2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2458,45 +2482,45 @@ msgid "Delete"
 msgstr "Excluir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr "Inserir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr "Tab"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr "Mod"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Atalhos"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "Janelas"
@@ -2504,7 +2528,7 @@ msgstr "Janelas"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr "Emoções"
@@ -2512,13 +2536,13 @@ msgstr "Emoções"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr "Gui"
 
@@ -2849,13 +2873,13 @@ msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. 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 "%s estão online"
 
 #. 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 "%s estão offline"
@@ -2878,7 +2902,7 @@ msgstr "Guilda"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "Comando: /invite <nick>"
 
@@ -2892,7 +2916,7 @@ msgstr "Este comando convida <nick> para a guilda em que você está."
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se seu <nick> possuir espaços, coloque entre aspas (\")."
 
@@ -2900,7 +2924,7 @@ msgstr "Se seu <nick> possuir espaços, coloque entre aspas (\")."
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
@@ -2913,26 +2937,26 @@ msgstr "Este comando faz com que o jogador saia da guilda."
 #. 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > Exibe esta ajuda."
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Convida um jogador para a sua guilda"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Sai da guilda em que você está"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4725,47 +4749,47 @@ msgid "Allow screensaver to run"
 msgstr "Permitir rodar proteção de tela"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Para de ignorar o outro jogador"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Fecha a aba de mensagem privada"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Comando: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Este comando fecha a atual aba de mensagem privada"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Comando: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Este comando ignora o outro jogador."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 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."
@@ -5051,7 +5075,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 "Criar"
 
@@ -6130,12 +6154,12 @@ msgid "requires v%s"
 msgstr "requer v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Aplicar"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
@@ -6351,131 +6375,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 "Criar grupo"
 
 #. 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 "J"
 
 #. 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 "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/socialwindow.cpp:1302
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. 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 "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. 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 "Você foi convidado(a) para entrar em um grupo."
 
 #. 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 "Você foi convidado(a) para entrar no grupo %s."
 
 #. 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 "%s te convidou para entrar em seu grupo."
 
 #. 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 "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -7089,52 +7113,52 @@ msgid "Guild castle: %s"
 msgstr "Castelo Guilda : %s"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Convida um jogador para o seu grupo"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Sai do grupo em que você está"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Mostra/Muda opções de compartilhamento de itens do grupo"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "Este comando convida <nick> para o seu grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "Este comando faz com que o jogador saia do grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Comando> /item <opção>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de itens do grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7143,28 +7167,28 @@ msgstr ""
 "de itens, ou \"0\", \"no\" e \"false\" para desabilitar."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Comando: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de itens do grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <policy>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7173,59 +7197,59 @@ msgstr ""
 "de experiência, ou \"0\", \"no\" e \"false\" para desabilitar."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
@@ -8028,9 +8052,3 @@ msgstr "Item desconhecido"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "Parar ataque"
-
-#~ msgid "Modifier key"
-#~ msgstr "Chave de modificação"
diff --git a/po/ru.po b/po/ru.po
index e39d48f42..01027a283 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
@@ -535,7 +535,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 "Настройка"
 
@@ -751,7 +752,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:152
 msgid "Party name is missing."
 msgstr "Не указано название группы"
 
@@ -942,14 +943,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файлстрокацвета файлназначения"
 
 #. 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 "Отладка"
@@ -1085,7 +1086,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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Движение"
 
@@ -1197,7 +1198,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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1206,7 +1207,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
@@ -1279,7 +1280,7 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1349,7 +1350,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 "Покинуть"
 
@@ -1431,7 +1432,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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Сохранить"
 
@@ -1810,9 +1811,8 @@ msgstr "Движение к навигационной точке"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "Модификаторы ярлыков"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2053,23 +2053,45 @@ msgid "Next Social Tab"
 msgstr "Следующая закладка общества"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Предыдущая закладка общества"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Горячие клавиши предметов"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Предыдущая закладка чата"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Следующая закладка чата"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr "Модификаторы смайлов"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr "Модификатор смайлов"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 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
@@ -2092,38 +2114,38 @@ msgstr "Ярлыки смайлов"
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Комбинация клавиш для смайла %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr "Кнопки нарядов"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Надеть наряд"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Копировать наряд"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr "Копирование надетого наряда"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 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
@@ -2146,228 +2168,228 @@ msgstr "Ярлыки нарядов"
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr "Комбинация клавиш наряда %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Переключение на чат"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Прокручивание чата вверх"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Прокручивание чата вниз"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Предыдущая закладка чата"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Следующая закладка чата"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "Закрыть текущую вкладку чата"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr "Предыдущая строка чата"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr "Следующая строка чата"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr "Модификатор чата"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Игнорирование ввода 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Игнорирование ввода 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Повернуться вверх"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Повернуться вниз"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Повернуться влево"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Повернуться вправо"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Сумасшедшие движения"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Поменять режим сумасшедших движений"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Быстрый сброс N предметов из 0 слота"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "Быстрый сброс N предметов"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Переключение счётчика быстрого сброса"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Быстрое лечения себя или цели"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "Использование заклинания #itenplz"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Использование магической атаки"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Переключение маг. атаки"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr "Переключение pvp атаки"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Изменение типа движения"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Изменение типа атаки оружием"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Изменение типа атаки"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Изменение режима следования"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Изменение режима имитации"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr "Включение/Выключение специальных модификаторов"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "Вкл./Выкл. звука"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Включение/Выключение режима отошел"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Эмуляция правого клика с клавиатуры"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "Изменение режима камеры"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr "Показывать экранную клавиатуру"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr "Кнопки движения"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 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 Down"
 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 Left"
 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 Right"
 msgstr "Движение вправо"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr "Движение вперед"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr "Кнопки движения к цели"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2390,32 +2412,34 @@ msgstr "Кнопки движения к цели"
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr "Перейти к точке %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr "Движение и выбор"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr "Движение в начало"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr "Движение в конец"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr "Страница вверх"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr "Страница вниз"
 
@@ -2424,7 +2448,7 @@ msgstr "Страница вниз"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2435,12 +2459,12 @@ msgid "Other"
 msgstr "Другое"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr "Выбор"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr "Выбор2"
 
@@ -2450,7 +2474,7 @@ msgstr "Выбор2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2459,45 +2483,45 @@ msgid "Delete"
 msgstr "Удалить"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr "Удаление влево"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr "Вставка"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr "Табуляция"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr "Модификатор"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr "Ctrl"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr "Основное"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "Окна"
@@ -2505,7 +2529,7 @@ msgstr "Окна"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr "Смайлы"
@@ -2513,13 +2537,13 @@ msgstr "Смайлы"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 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:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr "Интерфейс"
 
@@ -2850,13 +2874,13 @@ msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
 #. 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 "%s вошел(а)."
 
 #. 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 "%s вышел(а)."
@@ -2879,7 +2903,7 @@ msgstr "Гильдия"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "Команда: /invite <игрок>"
 
@@ -2893,7 +2917,7 @@ msgstr "Эта команда приглашает <имя персонажа> �
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
 
@@ -2901,7 +2925,7 @@ msgstr "Если ник содержит пробелы, заключите ег
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "Команда: /leave"
 
@@ -2914,26 +2938,26 @@ 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > Показать эту справку"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Пригласить игрока в Вашу гильдию"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Покинуть текущую гильдию"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей гильдии"
 
@@ -4733,49 +4757,49 @@ msgid "Allow screensaver to run"
 msgstr "Разрешить запуск скринсейвера"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Игнорировать другого игрока"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Перестать игнорировать другого игрока"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Закрыть вкладку перешептывания"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Команда: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Закрывает вкладку перешептывания"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Команда: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
 "отношений с ним."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
@@ -5060,7 +5084,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 "Создать"
 
@@ -6141,12 +6165,12 @@ msgid "requires v%s"
 msgstr "требуется v%s"
 
 #. 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 "Сбросить расположение окон"
 
@@ -6362,131 +6386,131 @@ msgstr "Друзей: %u/%u"
 
 #. 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 "Принято приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
 #. 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 "%s приглашает присоединиться к гильдии %s."
 
 #. 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 "Вас приглашают присоединиться к группе %s."
 
 #. 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 "%s приглашает Вас к себе в группу."
 
 #. 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 "%s приглашает присоединиться к %s группе."
 
 #. 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 "Выберите имя будущей группы."
 
@@ -7101,52 +7125,52 @@ msgid "Guild castle: %s"
 msgstr "Замки: %s"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Пригласить игрока в Вашу группу"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Покинуть текущую группу"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 "/item > Показать/Скрыть текущее состояние распределения предметов в группе"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Показать/Скрыть текущее состояние распределения опыта в группе"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "Эта команда приглашает <имя персонажа> к вам в группу."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "Эта команда заставляет игрока покинуть группу"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Команда: /item <политика разделения предметов>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "Команда изменяет политику разделения предметов между членами группы."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7155,27 +7179,27 @@ msgstr ""
 "\"0\", \"no\", \"false\" -- для выключения."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Команда: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr "Отображает текущую политику разделения предметов между членами группы."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "Команда: /exp <политика распределения опыта>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr "Эта команда изменяет политику распределения опыта в группе."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7184,58 +7208,58 @@ msgstr ""
 "общий опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "Команда: /exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 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:179 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:183 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:187 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:191
 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:223 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:227 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:231 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:235
 msgid "Experience sharing unknown."
 msgstr "Политика распределения опыта неизвестна."
 
@@ -8034,9 +8058,3 @@ msgstr "Неизвестный предмет"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr "животное"
-
-#~ msgid "Stop Attack"
-#~ msgstr "Остановка атаки"
-
-#~ msgid "Modifier key"
-#~ msgstr "Кнопка-модификатор"
diff --git a/po/sk.po b/po/sk.po
index 3d96ccafa..fb108f225 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -538,7 +538,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 ""
 
@@ -661,7 +661,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 ""
@@ -683,7 +683,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 ""
 
@@ -888,25 +888,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 ""
 
@@ -942,23 +942,23 @@ 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 ""
 
@@ -1072,7 +1072,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1184,7 +1184,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1266,7 +1266,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1418,7 +1418,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1483,7 +1483,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 "Použiť"
 
@@ -1674,9 +1674,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 "Odstrojiť"
 
@@ -1685,7 +1685,7 @@ msgstr "Odstrojiť"
 #. 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 "Vystrojiť"
 
@@ -1693,7 +1693,7 @@ msgstr "Vystrojiť"
 #. 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 ""
 
@@ -1708,7 +1708,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 "Zahodiť"
 
@@ -1797,7 +1797,7 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
@@ -2313,100 +2313,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2415,7 +2410,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2426,12 +2421,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2441,7 +2436,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:1803 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
@@ -2450,45 +2445,45 @@ msgid "Delete"
 msgstr "Vymazať"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2496,7 +2491,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2504,13 +2499,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2728,7 +2723,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
@@ -4371,8 +4366,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 ""
 
@@ -4459,106 +4454,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 ""
 
@@ -4823,7 +4818,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 "Vybavenie"
diff --git a/po/sq.po b/po/sq.po
index 48ddcdf0e..741174436 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -537,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 ""
 
@@ -660,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 ""
@@ -682,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 ""
 
@@ -887,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 ""
 
@@ -941,23 +941,23 @@ 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 ""
 
@@ -1071,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1183,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1265,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1417,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1482,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 ""
 
@@ -1673,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 ""
 
@@ -1684,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 ""
 
@@ -1692,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 ""
 
@@ -1707,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 ""
 
@@ -1796,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
@@ -2312,100 +2312,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2409,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2420,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2435,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:1803 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
@@ -2449,45 +2444,45 @@ msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2490,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2498,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2727,7 +2722,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
@@ -4370,8 +4365,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 ""
 
@@ -4458,106 +4453,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 ""
 
@@ -4822,7 +4817,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 ""
diff --git a/po/sv.po b/po/sv.po
index 4f00ea55b..a85a23810 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/manaplus/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -537,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 "Video"
 
@@ -660,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 ""
@@ -682,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 ""
 
@@ -887,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 ""
 
@@ -941,23 +941,23 @@ 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 "Kunde inte spara skärmbild!"
 
 #. 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 "Nätverksfel"
 
@@ -1071,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1183,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1265,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1417,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/setup.cpp:94
 msgid "Store"
 msgstr "Lagra"
 
@@ -1482,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 "Använd"
 
@@ -1673,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 "Avrusta"
 
@@ -1684,7 +1684,7 @@ msgstr "Avrusta"
 #. 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 "Utrusta"
 
@@ -1692,7 +1692,7 @@ msgstr "Utrusta"
 #. 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 ""
 
@@ -1707,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 "Släpp"
 
@@ -1796,8 +1796,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Sluta attackera"
+msgid "Stop Attack / Modifier key"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2312,100 +2312,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr "Gå uppåt"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr "Gå nedåt"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr "Gå åt vänster"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr "Gå åt höger"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2409,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2420,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2435,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:1803 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
@@ -2449,45 +2444,45 @@ msgid "Delete"
 msgstr "Ta bort"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2490,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2498,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:1922 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chatt"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
 msgid "Gui"
 msgstr ""
 
@@ -2727,7 +2722,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
@@ -4370,8 +4365,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 "Starta om din klient för att ändringen ska börja gälla."
 
@@ -4458,106 +4453,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 "Helskärm"
 
 #. 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 "Särskild muspekare"
 
 #. 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 "Omstart krävs för att ändringarna ska synas."
 
 #. 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 "Ändringar i OpenGL kräver omstart."
 
 #. 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 ""
 
@@ -4822,7 +4817,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 "Utrustning"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 819e042b7..360889e01 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.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-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -537,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 "Video"
 
@@ -660,7 +660,7 @@ msgstr "Farväl, kom gärna tillbaka snart igen..."
 
 #. 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 "%s existerar inte och kan inte bli skapat! Avslutar."
@@ -682,7 +682,7 @@ msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2998
+#: src/client.cpp:3000
 msgid "Do you want to open support page?"
 msgstr "Vill du öppna support-sidan?"
 
@@ -887,25 +887,25 @@ msgstr "%d sekunder"
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: 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 "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1477 src/commands.cpp:1486
+#: src/commands.cpp:1479 src/commands.cpp:1488
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
@@ -941,23 +941,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1071,7 +1071,7 @@ msgstr "Nuke"
 #: 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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Flytta"
 
@@ -1183,7 +1183,7 @@ msgstr "Lägg till namnet i chat"
 #: 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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1265,7 +1265,7 @@ msgstr "Rör kamera"
 #. 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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1417,7 +1417,7 @@ msgstr "Lägg till alla för trade"
 #. 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/setup.cpp:94
 msgid "Store"
 msgstr "Lagra"
 
@@ -1482,7 +1482,7 @@ msgstr "Hämta ut alla"
 #. 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 "Använd"
 
@@ -1673,9 +1673,9 @@ msgstr "Skydda item"
 #. 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 "Unequip"
 
@@ -1684,7 +1684,7 @@ msgstr "Unequip"
 #. 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 "Equip"
 
@@ -1692,7 +1692,7 @@ msgstr "Equip"
 #. 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 "Släng..."
 
@@ -1707,7 +1707,7 @@ msgstr "Släng allt"
 #. 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 "Släng"
 
@@ -1796,8 +1796,8 @@ msgstr "Flytta till navigationspunkt"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Stoppa Attack"
+msgid "Stop Attack / Modifier key"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2312,100 +2312,95 @@ msgstr "Växla kameraläge"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Modifier-tangent"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr "Visa onscreen-tangentbord"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr "Flytta ner"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr "Flytta vänster"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr "Flytta höger"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr "Flytta och välj"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2409,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2420,12 @@ msgid "Other"
 msgstr "Annat"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2435,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:1803 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
@@ -2449,45 +2444,45 @@ msgid "Delete"
 msgstr "Radera"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 msgid "Basic"
 msgstr "Enkel"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Genvägar"
 
 #. 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr "Fönster"
@@ -2495,7 +2490,7 @@ msgstr "Fönster"
 #. 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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr "Emotes"
@@ -2503,13 +2498,13 @@ msgstr "Emotes"
 #. 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:1922 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
 msgid "Gui"
 msgstr "Gui"
 
@@ -2727,7 +2722,7 @@ msgstr "Level: %u"
 
 #. 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
@@ -4370,8 +4365,8 @@ msgstr "Tema ändrat"
 
 #. 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 "Starta om din klient för att ändringarna ska utföras."
 
@@ -4458,106 +4453,106 @@ msgid "Button %u action"
 msgstr "Knapp %u händelse"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
 msgid "Full screen"
 msgstr "Fullskärm"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
 msgid "FPS limit:"
 msgstr "FPS-begränsning:"
 
 #. 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 "Alternativ FPS-begränsning:"
 
 #. 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 "Upptäck bästa läget"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
 msgid "Show cursor"
 msgstr "Visa muspekare"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
 msgid "Custom cursor"
 msgstr "Anpassad muspekare"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
 msgid "Enable resize"
 msgstr "Aktivera storlekändring"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
 msgid "No frame"
 msgstr "Ingen ram"
 
 #. 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 "Ingen"
 
 #. 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 "Misslyckades att ändra till fönster-läge och återställandet av det gamla läget misslyckades också!"
 
 #. 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 "Misslyckades att ändra till fullskärms-läge och återställandet av det gamla läget misslyckades också!"
 
 #. 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 "Ändrar till Fullskärm"
 
 #. 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 "Omstart behövs för att ändringar ska genomföras."
 
 #. 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 "Ändrar till OpenGL"
 
 #. 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 "Tillämpar ändringar till OpenGL, behöver omstart."
 
 #. 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 "Anpassad upplösning (exempel: 1024x768)"
 
 #. 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 "Skriv in ny upplösning:"
 
 #. 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 "Skärmupplösning ändrad"
 
-#: 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 "Vissa fönster kan flyttas på för att passa i lägre upplösning."
 
@@ -4822,7 +4817,7 @@ msgstr "EQU"
 
 #. 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 "Equipment"
diff --git a/po/te.po b/po/te.po
index 917189df7..25b874629 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -537,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 ""
 
@@ -660,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 ""
@@ -682,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 ""
 
@@ -887,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 ""
 
@@ -941,23 +941,23 @@ 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 ""
 
@@ -1071,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1183,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1265,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1417,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1482,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 ""
 
@@ -1673,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 ""
 
@@ -1684,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 ""
 
@@ -1692,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 ""
 
@@ -1707,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 ""
 
@@ -1796,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
@@ -2312,100 +2312,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2409,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:1779 src/gui/setupactiondata.h:1924
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2420,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2435,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:1803 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
@@ -2449,45 +2444,45 @@ msgid "Delete"
 msgstr "తొలగించు"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2490,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2498,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2727,7 +2722,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
@@ -4370,8 +4365,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 ""
 
@@ -4458,106 +4453,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 ""
 
@@ -4822,7 +4817,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 ""
diff --git a/po/th.po b/po/th.po
index 33b025eb6..89cadc6f0 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-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+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"
@@ -536,7 +536,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 +659,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 +681,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 ""
 
@@ -886,25 +886,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 ""
 
@@ -940,23 +940,23 @@ 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 +1070,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1182,7 +1182,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1264,7 +1264,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1416,7 +1416,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1481,7 +1481,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 +1672,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 +1683,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 +1691,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 +1706,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 +1795,7 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
@@ -2311,100 +2311,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2413,7 +2408,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:1779 src/gui/setupactiondata.h:1924
 #: 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 +2419,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2439,7 +2434,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:1803 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 +2443,45 @@ msgid "Delete"
 msgstr "ลบทิ้ง"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2494,7 +2489,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2502,13 +2497,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2726,7 +2721,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
@@ -4369,8 +4364,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 +4452,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 ""
 
@@ -4821,7 +4816,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 ""
diff --git a/po/tr.po b/po/tr.po
index 42cb7102d..91de86cdb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
 "language/tr/)\n"
@@ -528,7 +528,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 "Ayarlar"
 
@@ -744,7 +745,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:152
 msgid "Party name is missing."
 msgstr "Grup adı eksik."
 
@@ -934,14 +935,14 @@ 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 "Genel"
 
 #. 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 "Hata ayıklama"
@@ -1077,7 +1078,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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Taşı"
 
@@ -1189,7 +1190,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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1198,7 +1199,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
@@ -1271,7 +1272,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1341,7 +1342,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 "Ayrıl"
 
@@ -1423,7 +1424,7 @@ msgstr "Tamamını takasa ekle"
 #. 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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "Sakla"
 
@@ -2044,23 +2045,45 @@ msgid "Next Social Tab"
 msgstr "Sonraki Sosyal Sekmesi"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "Önceki Sosyal Sekmesi"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "Nesne Kısayol Tuşları"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "Önceki Sohbet Sekmesi"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "Sonraki Sohbet Sekmesi"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 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
@@ -2083,38 +2106,38 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Duygu Kısayolu %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "Kıyafeti Giy"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr "Kıyafeti Kopyala"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 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
@@ -2137,228 +2160,228 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "Sohbete Geç"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "Sohbeti Yukarı Kaydır"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "Sohbeti Aşağı Kaydır"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "Önceki Sohbet Sekmesi"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "Sonraki Sohbet Sekmesi"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "Gözmezden gel giriş 1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "Görmezden gel giriş 2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "Yukarı Yönlen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "Aşağı Yönlen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "Sola Yönlen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "Sağa Yönlen"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "Çılgın Hareketler"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "Çılgın hareket modunu değiştir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr "0 yerinden N tane nesneyi hızlı bırak"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "N nesneyi hızlı bırak"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr "Hızlı Düşürme Sayacını Değiştir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "Hedefi veya kendini hızlı iyileştir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr "#itenplz büyüsünü kullan"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "Büyü saldırısını kullan"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "Büyü saldırısını değiştir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "Hareket tipini değiştir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "Saldırı Silah Tipini Değiştir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "Saldırı Tipini Değiştir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "Takip modunu değiştir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "Taklit modunu değiştir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "Ses Aç / Kapa"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "Uzakta modunu Aktifleştir / Deaktifleştir"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "Sağ tıklamayı kılavyeden taklit et"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "Kamera moduna geç"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "Yukarı Taşı"
 
 #. 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 Down"
 msgstr "Aşağı Taşı"
 
 #. 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 Left"
 msgstr "Sola Taşı"
 
 #. 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 Right"
 msgstr "Sağa Taşı"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2381,32 +2404,34 @@ msgstr ""
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr ""
 
@@ -2415,7 +2440,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2426,12 +2451,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr ""
 
@@ -2441,7 +2466,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2450,45 +2475,45 @@ msgid "Delete"
 msgstr "Sil"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2496,7 +2521,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2504,13 +2529,13 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Sohbet"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr ""
 
@@ -2841,13 +2866,13 @@ msgid "%s whispers: %s"
 msgstr "%s %s'e fısıldıyor:"
 
 #. 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 ""
@@ -2870,7 +2895,7 @@ msgstr "Lonca"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr ""
 
@@ -2884,7 +2909,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Eğer <kullanıcı adı> boşluk içeriyorsa, başına ve sonuna tırnak işareti (\") "
@@ -2894,7 +2919,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr ""
 
@@ -2907,26 +2932,26 @@ 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 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
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4715,49 +4740,49 @@ msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Diğer oyuncuyu görmezden gel"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Diğer oyuncuyu görmezden gelmeyi bırak"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > Fısıltı sekmesini kapat"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "Komut: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "Bu komut mevcut fısıltı sekmesini kapatır"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "Komut: /ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Bu komut diğer oyuncuyu halihazırdaki ilişkilerine bakılmaksızın görmezden "
 "gelir."
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "Komut: /unignore <oyuncu>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Bu komut; görmezden gelinen oyuncuyu, görmezden gelmeyi bırakır."
 
@@ -5042,7 +5067,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 "Oluştur"
 
@@ -6116,12 +6141,12 @@ msgid "requires v%s"
 msgstr "v%s gerektirir"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "Uygula"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "Pencereleri sıfırla"
 
@@ -6337,131 +6362,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 "Grup kur"
 
 #. 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 "Davet et"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%s 'ten gelen grup daveti kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%s 'ten gelen grup daveti reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "%s isimli lonca oluşturuluyor."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "%s adlı grup kuruluyor."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "Lonca Adı"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "Loncanızın adını seçiniz."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr "Lonca isteği alındı, ancak halihazırda bir tane var."
 
 #. 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 "%s seni %s loncasına katılmaya davet etti."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "Lonca davetini kabul et"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr "Bir grup daveti aldın, ancak zaten bir gruba dahilsin."
 
 #. 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 "Bir gruba katılma daveti aldın."
 
 #. 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 "%s grubuna katılmaya davet edildin."
 
 #. 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 "%s seni gruplarına davet etti."
 
 #. 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 "%s seni %s grubuna davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "Grup Davetini Kabul et"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "Grup kuramazsın. Zaten bir gruba dahilsin"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr "Grup Adı"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "Grubunun adını seç."
 
@@ -7072,51 +7097,51 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Grubuna bir oyuncu davet et"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Dahil olduğun gruptan ayrıl"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Grup nesne paylaşımı ayarlarını göster/değiştir"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Grup tecrübe paylaşımı ayarlarını göster/değiştir"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "Bu komut <nick> 'i gruba davet eder."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "Bu komut oyuncunun gruptan ayrılmasına sebep olur."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "Komut: /nesne <policy>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "Bu komut grubun nesne paylaşım ayarlarını değiştirir."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7126,85 +7151,85 @@ msgstr ""
 "devre dışı bırakır."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "Komut: /item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr "Bu komut grubun var olan nesne paylaşım ayarlarını gösterir."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr "Bu komut grubun tecrübe paylaşım ayarlarını değiştirir."
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 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
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Bu komut grubun var olan tecrübe paylaşım ayarlarını gösterir."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "Nesne paylaşımı etkinleştirildi."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "Nesne paylaşımı devre dışı bırakıldı."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "Nesne paylaşımı mümkün değil."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr "Nesne paylaşımı bilinmiyor."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 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:227 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:231 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:235
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7998,6 +8023,3 @@ msgstr "Bilinmeyen nesne"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "Saldırmayı durdur"
diff --git a/po/vls.po b/po/vls.po
index e7b59af1f..0fafd20b5 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -536,7 +536,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 +659,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 +681,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 ""
 
@@ -886,25 +886,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 ""
 
@@ -940,23 +940,23 @@ 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 +1070,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1182,7 +1182,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1264,7 +1264,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1416,7 +1416,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1481,7 +1481,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 +1672,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 +1683,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 +1691,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 +1706,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 +1795,7 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
@@ -2311,100 +2311,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2413,7 +2408,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:1779 src/gui/setupactiondata.h:1924
 #: 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 +2419,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2439,7 +2434,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:1803 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 +2443,45 @@ msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2494,7 +2489,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2502,13 +2497,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2726,7 +2721,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
@@ -4369,8 +4364,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 +4452,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 ""
 
@@ -4821,7 +4816,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 ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e0332a7f3..d63b0785a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -529,7 +529,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 "设置"
 
@@ -743,7 +744,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:152
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
@@ -932,14 +933,14 @@ 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 "调试 "
@@ -1075,7 +1076,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:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "移动"
 
@@ -1187,7 +1188,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:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1196,7 +1197,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
@@ -1269,7 +1270,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1339,7 +1340,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 "留下"
 
@@ -1421,7 +1422,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:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "存储"
 
@@ -1800,9 +1801,8 @@ msgstr "移动导航点"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "修改按键"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2043,23 +2043,45 @@ msgid "Next Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "上一页社会标签"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "项目的快捷键"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "上一个聊天窗口标签页"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "下一个聊天窗口标签页"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 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
@@ -2082,38 +2104,38 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快捷键为 %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "装备套装"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 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
@@ -2136,228 +2158,228 @@ msgstr ""
 #: 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
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "关闭当前聊天标签"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "直接向上"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "直接下"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "直接离开"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "直接对"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "疯狂移动"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "更改疯狂移动模式"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "快速下降序号项目"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "快速愈合的目标或自我"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "使用魔法攻击"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "切换魔法攻击"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "更改移动类型"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "更改攻击型武器"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "更改攻击类型"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "更改跟随模式"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "更改仿模式"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "开/关 音频"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "启用/禁用离开模式"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "从键盘模拟右键单击"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "切换模式"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 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 Down"
 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 Left"
 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 Right"
 msgstr "向右移动"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 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
@@ -2380,32 +2402,34 @@ msgstr ""
 #: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2438,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2449,12 @@ msgid "Other"
 msgstr "其他"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2464,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 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
@@ -2449,45 +2473,45 @@ msgid "Delete"
 msgstr "删除"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2519,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2527,13 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 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:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr ""
 
@@ -2840,13 +2864,13 @@ msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
 #. 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 ""
@@ -2869,7 +2893,7 @@ msgstr "帮会"
 #. 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
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "命令：/invite <昵称>"
 
@@ -2883,7 +2907,7 @@ msgstr ""
 #. 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
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<昵称>包含空格，请用双引号(\")括起。"
 
@@ -2891,7 +2915,7 @@ msgstr "如果<昵称>包含空格，请用双引号(\")括起。"
 #. 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
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "命令：/leave"
 
@@ -2904,26 +2928,26 @@ 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
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > 显示该帮助信息。"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > "
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > "
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4709,47 +4733,47 @@ msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > "
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > 停止忽视了其他"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > 关闭密语标签页"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "命令: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "该命令关闭当前密语标签页。"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "命令：/ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr "此命令忽略了其他，不管目前的关系。"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "命令: /unignore <玩家>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
 
@@ -5034,7 +5058,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 +6130,12 @@ msgid "requires v%s"
 msgstr "需要 v%s"
 
 #. 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 +6351,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 "接受%s团队的邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
 #. 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 "%s邀请你加入公会%s"
 
 #. 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 "您已被邀请加入%s的团队。"
 
 #. 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 "%s已经邀请你加入他们的帮会。"
 
 #. 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 "%s已经邀请你加入帮会%s。"
 
 #. 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 "选择n的名称。"
 
@@ -7060,51 +7084,51 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > 邀请某一玩家加入您的帮会"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > 离开你所在的帮会"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > 显示/改变帮会项目共享选项"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > 显示/改变帮会经验共享选项"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "该命令邀请<昵称>和你聚会。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "该命令致使玩家离开帮会"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "命令：/item <策略>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "改命令改变帮会的物品共享策略。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7113,27 +7137,27 @@ msgstr ""
 "\"false\"用来禁止物品共享。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "命令：/item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr "该命令显示帮会现有的物品共享策略。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "命令：/exp <策略>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr "该命令改变帮会的经验共享策略。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7142,58 +7166,58 @@ msgstr ""
 "\"false\"用来关闭经验共享。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "命令：/exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 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:179 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:183 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:187 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:191
 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:223 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:227 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:231 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:235
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7989,6 +8013,3 @@ msgstr "未知物品"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "停止攻击"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 8dc32082f..67bf497f3 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -536,7 +536,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 +659,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 +681,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 ""
 
@@ -886,25 +886,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 ""
 
@@ -940,23 +940,23 @@ 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 +1070,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1182,7 +1182,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1264,7 +1264,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1416,7 +1416,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/setup.cpp:94
 msgid "Store"
 msgstr ""
 
@@ -1481,7 +1481,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 +1672,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 +1683,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 +1691,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 +1706,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 +1795,7 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
@@ -2311,100 +2311,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2413,7 +2408,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:1779 src/gui/setupactiondata.h:1924
 #: 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 +2419,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2439,7 +2434,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:1803 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 +2443,45 @@ msgid "Delete"
 msgstr "刪除"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2494,7 +2489,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2502,13 +2497,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2726,7 +2721,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
@@ -4369,8 +4364,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 +4452,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 "確認切換OpenGL需要重新開始"
 
 #. 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 ""
 
@@ -4821,7 +4816,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 "裝備"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1fd1a06fa..9286fcedd 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: 2014-01-30 11:24+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -536,7 +536,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 +659,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 +681,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 ""
 
@@ -886,25 +886,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 ""
 
@@ -940,23 +940,23 @@ 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 +1070,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:1912 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
 
@@ -1182,7 +1182,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:1797
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1264,7 +1264,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:1920
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1416,7 +1416,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/setup.cpp:94
 msgid "Store"
 msgstr "寄放"
 
@@ -1481,7 +1481,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 +1672,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 +1683,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 +1691,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 +1706,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,8 +1795,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "停止攻擊"
+msgid "Stop Attack / Modifier key"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2311,100 +2311,95 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
 msgid "Move Up"
 msgstr "上移"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
 msgid "Move Down"
 msgstr "下移"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
 msgid "Move Left"
 msgstr "左移"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
 msgid "Move Right"
 msgstr "右移"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
 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
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: 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:1428 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 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 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
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
 msgid "Page down"
 msgstr ""
 
@@ -2413,7 +2408,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:1779 src/gui/setupactiondata.h:1924
 #: 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 +2419,12 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
 msgid "Select2"
 msgstr ""
 
@@ -2439,7 +2434,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:1803 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 +2443,45 @@ msgid "Delete"
 msgstr "刪除"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
 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:1914 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:1916 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2494,7 +2489,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:1918 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2502,13 +2497,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:1922 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:1926
 msgid "Gui"
 msgstr ""
 
@@ -2726,7 +2721,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
@@ -4369,8 +4364,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 +4452,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 "確認切換OpenGL需要重新開始"
 
 #. 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 ""
 
@@ -4821,7 +4816,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 "裝備"
author	Andrei Karas <akaras@inbox.ru>	2014-02-04 23:03:38 +0300
committer	Andrei Karas <akaras@inbox.ru>	2014-02-04 23:03:38 +0300
commit	0b67538b1d403a14f4754aaa7fe3aabc098abe41 (patch)
tree	3a3bd26cb4305c728f843538fd44b72d3314f6a0 /po
parent	8ad2fe11ef255b3443eb8b98d3eb40a54b04cbb4 (diff)
download	manaplus-0b67538b1d403a14f4754aaa7fe3aabc098abe41.tar.gz manaplus-0b67538b1d403a14f4754aaa7fe3aabc098abe41.tar.bz2 manaplus-0b67538b1d403a14f4754aaa7fe3aabc098abe41.tar.xz manaplus-0b67538b1d403a14f4754aaa7fe3aabc098abe41.zip