Update translations.

24 files changed, 2502 insertions, 2208 deletions

diff --git a/po/ca.po b/po/ca.po
index f4f719c38..c7e10d41d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Javier Muñoz Ramón <javier.mura84@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
@@ -374,7 +374,7 @@ msgstr "General"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depura"
@@ -804,8 +804,8 @@ msgstr "Absent"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -857,7 +857,7 @@ msgstr "(F) mode de càmera lliure"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -871,31 +871,38 @@ msgid "Close"
 msgstr "Tanca"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Vol obrir la pàgina de suport?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Missatge"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Reviu"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Reviu"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Porteu més de la meitat del vostre pes. No podeu recuperar salut."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Porteu menys de la meitat del vostre pes. Podeu recuperar salut."
 
@@ -1824,7 +1831,7 @@ msgstr "Restaura la càmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Vestuari"
@@ -1844,7 +1851,7 @@ msgstr "Treu vestuari"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Conjurs"
 
@@ -2301,7 +2308,7 @@ msgstr "Desatendre"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -2422,7 +2429,7 @@ msgstr "Llença tots"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Llença"
@@ -2463,7 +2470,7 @@ msgstr "Atributs"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2481,7 +2488,7 @@ msgstr "Emmagatzematge"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2853,7 +2860,7 @@ msgstr "Bàsic"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Dreceres"
 
@@ -2862,7 +2869,7 @@ msgstr "Dreceres"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Finestres"
 
@@ -2885,7 +2892,7 @@ msgstr "Emoticones"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Xat"
 
@@ -2897,7 +2904,7 @@ msgstr "Xat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3353,7 +3360,7 @@ msgstr "%s ja no es troba en línia."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4708,7 +4715,7 @@ msgstr "Alterna objectius del monstre"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4883,7 +4890,7 @@ msgstr "Activa notificacions importants"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4960,124 +4967,130 @@ msgstr "Activa solució temporal alt-tab"
 msgid "Shortcut buttons"
 msgstr "Dreceres"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Dreceres"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Servidor intermediari"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Tipus de servidor intermediari"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Adreça de servidor intermediari:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr "Túnel a través d'un servidor intermediari HTTP"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr "S'està enregistrant"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr "Activa comprovació de versió d'OpenGL (no desactivis)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Activa registre de depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr "Ignora registre de paquets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr "Registra paquets sense implementar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Activa registre OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Activa registre d'entrada"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr "Nivell d'enregistrament SDL"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Puja arxiu de registre"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Activa atac del servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr "Amaga enllaç a pàgina de suport quan hi ha errors"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Activa clics dobles"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Activa comprovador de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activa protecció de servidors amb errors (no desactivis)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Mode de tràfic baix"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilitza FBO per a captures de pantalla (només per a opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr "Directori de captures de pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Latència de xarxa entre sub-servidors"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Mostra fons"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Sobreescriu densitat de la pantalla"
 
@@ -5094,7 +5107,7 @@ msgstr "Sense mods presents"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "No"
 
@@ -6071,231 +6084,231 @@ msgid "Visible players: %d"
 msgstr "Jugadors visibles: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "QEL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Qui està en línia"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "AJU"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "MI"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Missions"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "EM"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Estadístiques de morts"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Emoticones"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "XA"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "EST"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Estat"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipament"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr "CA"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Habilitats"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "CON"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "LLE"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "HS"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Sabíeu que"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "BOT"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "VES"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr "AC"
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr "Actualitzacions"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr "BA"
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banc"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr "CO"
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr "Correu"
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr "IS"
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr "Informació del servidor"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DPR"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "FIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configuració"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6688,7 +6701,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Sí"
 
diff --git a/po/cs.po b/po/cs.po
index a0afef582..ec3943072 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
@@ -380,7 +380,7 @@ msgstr "Obecný"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -810,8 +810,8 @@ msgstr "Pryč"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -863,7 +863,7 @@ msgstr "(F) mód volné kamery"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -877,31 +877,38 @@ msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Preješ si otevřít stránku podpory?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Zpráva"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Oživ"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Oživ"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Nesete více než polovinu vaší váhy. Regenerace života nyní není možná."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
@@ -1831,7 +1838,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Výstroje"
@@ -1851,7 +1858,7 @@ msgstr "Vyčistit výstroj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Kouzla"
 
@@ -2308,7 +2315,7 @@ msgstr "Přehlížet"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignorovat"
 
@@ -2429,7 +2436,7 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Upustit"
@@ -2470,7 +2477,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2488,7 +2495,7 @@ msgstr "Sklad"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2860,7 +2867,7 @@ msgstr "Zkladní"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Zkratky"
 
@@ -2869,7 +2876,7 @@ msgstr "Zkratky"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Okna"
 
@@ -2892,7 +2899,7 @@ msgstr "Smajlíci"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Chat"
 
@@ -2904,7 +2911,7 @@ msgstr "Chat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3360,7 +3367,7 @@ msgstr "%s se právě odpojil."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4579,7 +4586,7 @@ msgstr "Cyklovat zaměřená monstra"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4754,7 +4761,7 @@ msgstr "Povolit upozornění na váhu"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4831,124 +4838,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr "Knoflíky zkratek"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Knoflíky zkratek"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Proxy server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Typ proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Proxy adresa:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Zapnout debug záznam"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr "Ignorovat pakety záznamu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Zapni OpenGL log"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Povolit záznam vstupu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Uploadovat soubor se záznamem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Povolit útok na straně serveru"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr "Skrýt stránku podpory při chybě"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Povolit dvojklik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Zapnout ověřovač botů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Zapnout ochranu proti vadným serverům (nevypínej)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Mód nízkého síťového provozu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Použít FBO pro zachycení obrazovky (pouze pro openGl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr "Složka pro snímky obrazovky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Zpoždění sítě mezi sub servery"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Zobrazit pozadí"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Vlastní nastavení hustoty obrazovky"
 
@@ -4965,7 +4978,7 @@ msgstr "Nejsou dostupné žádné modifikace"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Ne"
 
@@ -5940,231 +5953,231 @@ msgid "Visible players: %d"
 msgstr "Viditelní hráči: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Kdo je online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "POM"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Nápověda"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "ÚK"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Úkoly"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "SZ"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Statistiky zabíjení"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Smajlíci"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Stav"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "VYB"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Vybavení"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "DOV"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Dovednosti"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Společenství"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "ZK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "KO"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "UP"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "VŽ"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Víte že"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "OBCH"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "VÝ"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr "AK"
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr "Aktualizace"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr "BA"
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banka"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "OKN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "NAS"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6552,7 +6565,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Ano"
 
diff --git a/po/de.po b/po/de.po
index 005ca720b..4c1bbce2c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Kristin Joris <kristin.joris@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
@@ -410,7 +410,7 @@ msgstr "Allgemein"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -840,8 +840,8 @@ msgstr "Abwesend"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -893,7 +893,7 @@ msgstr "(F) Kameramodus: Frei"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -907,25 +907,32 @@ msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Willst du die Unterstützungsseite öffnen?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Nachricht"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Wiederbeleben"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Wiederbeleben"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -933,7 +940,7 @@ msgstr ""
 "Gesundheit nicht mehr regenerieren."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Du trägst weniger als die Hälfte des Gewichts. Du kannst nun deine "
@@ -1864,7 +1871,7 @@ msgstr "Kamera wiederherstellen"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Ausrüstungset"
@@ -1884,7 +1891,7 @@ msgstr "Ausrüstungset leeren"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Zaubersprüche"
 
@@ -2341,7 +2348,7 @@ msgstr "Missachten"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -2462,7 +2469,7 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -2503,7 +2510,7 @@ msgstr "Status"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2521,7 +2528,7 @@ msgstr "Lager"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2893,7 +2900,7 @@ msgstr "Normal"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Kurzbefehle"
 
@@ -2902,7 +2909,7 @@ msgstr "Kurzbefehle"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fenster"
 
@@ -2925,7 +2932,7 @@ msgstr "Gefühle"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Chat"
 
@@ -2937,7 +2944,7 @@ msgstr "Chat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3393,7 +3400,7 @@ msgstr "%s ist jetzt Offline."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4745,7 +4752,7 @@ msgstr "Zwischen anvisierten Monstern wechseln"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4920,7 +4927,7 @@ msgstr "Benachrichtigungen über Gewicht aktivieren"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4999,124 +5006,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr "Kurzbefehlknöpfe"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Kurzbefehlknöpfe"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Proxy Server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Proxy Typ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Proxy addresse:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr "Tunnel via HTTP proxy"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr "OpenGL Versionsprüfung aktivieren (nicht deaktivieren)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Debuglog aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr "Aufzeichnung der Pakete ignorieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr "Unimplementierte Pakete loggen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "OpenGL-Log aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Eingabelog aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Log-Datei hochladen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Serverseitigen Angriff aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr "Bei Fehlermeldungen Link zur Unterstützungsseite verstecken"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Doppelklick aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Botprüfer einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Schutz bei fehlerhaften-Servern aktiveren (Nicht deaktivieren)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Niedriger Datenverkehrsmodus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "FBO für Screenshots benutzen (Nur für openGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr "Screenshotverzeichnis"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Netzwerkverzug zwischen Unterservern"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Hintergrund anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Bildschirmraster überschreiben"
 
@@ -5133,7 +5146,7 @@ msgstr "Keine Mods vorhanden"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Nein"
 
@@ -6113,231 +6126,231 @@ msgid "Visible players: %d"
 msgstr "Sichtbare Spieler: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Wer ist Online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "HIF"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Quests"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "TS"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Tötungsstatistik"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Similies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "AUS"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Ausrüstung"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr "EK"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "KAR"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "FÄH"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Fähigkeiten"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOZ"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Sozial"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "KB"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "ZS"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "WW"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "WDS"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Wusstest du schon?"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "STD"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "RS"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr "UP"
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr "Updates"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr "BA"
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Bank"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr "NA"
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr "Nachricht"
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr "SI"
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr "Server-Information"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "FL"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "EINST"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6730,7 +6743,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Ja"
 
diff --git a/po/eo.po b/po/eo.po
index 05d8779ea..2d998b703 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/akaras/manaplus/language/"
@@ -374,7 +374,7 @@ msgstr "Ĝenerala"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Sencimigo"
@@ -804,8 +804,8 @@ msgstr "For"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -857,7 +857,7 @@ msgstr "(F) libera reĝimo de vidpunkto"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -871,31 +871,38 @@ msgid "Close"
 msgstr "Fermi"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Ĉu vi volas malfermi subtenan retpaĝon?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Mesaĝo"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Reviviĝi"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Reviviĝi"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Vi portas pli ol duonon de via pezo. Vi ne povas resaniĝi."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Vi portas malpli ol duonon de via pezo. Vi povas resaniĝi."
 
@@ -1824,7 +1831,7 @@ msgstr "Restaŭri vidpunkton"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Vestaroj"
@@ -1844,7 +1851,7 @@ msgstr "Vakigi vestaron"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Sorĉoj"
 
@@ -2301,7 +2308,7 @@ msgstr "Malobservi"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Malatenti"
 
@@ -2422,7 +2429,7 @@ msgstr "Demeti ĉion"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Demeti"
@@ -2463,7 +2470,7 @@ msgstr "Atributoj"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2481,7 +2488,7 @@ msgstr "Deponejo"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2853,7 +2860,7 @@ msgstr "Bazaj"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Fulmoklavoj"
 
@@ -2862,7 +2869,7 @@ msgstr "Fulmoklavoj"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fenestroj"
 
@@ -2885,7 +2892,7 @@ msgstr "Mienoj"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Retbabilado"
 
@@ -2897,7 +2904,7 @@ msgstr "Retbabilado"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3353,7 +3360,7 @@ msgstr "%s eksterretiĝis."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4688,7 +4695,7 @@ msgstr "Cikli monstrajn celojn"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4863,7 +4870,7 @@ msgstr "Ŝalti avizojn pri pezo"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4941,124 +4948,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr "Fulmoklavoj"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Fulmoklavoj"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Prokura servilo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Tipo de prokuro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Prokura adreso:pordo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr "Ŝalti kontrolon de OpenGL versio (ne malŝaltu)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Ŝalti sencimigan protokolon"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr "Malatenti protokoladon de paketoj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr "Protokoli nerealigitajn paketojn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Ŝalti protokolon de OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Ŝalti protokolon de enigo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Alŝuti protokolan dosieron"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Ŝalti servilflankan atakon"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr "Kaŝi ligilon al subtena retpaĝo je eraro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Ŝalti duoblajn klakojn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Ŝalti kontrolanton de robotoj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Ŝalti protekton kontraŭ cimigplenaj serviloj (ne malŝaltu)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Trafikŝpariga reĝimo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Uzi FBO por ekrankopioj (nur por opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr "Ekrankopia dosierujo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Reta prokrasto inter sub-serviloj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Montri fonon"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Transpasi denson de ekrano"
 
@@ -5075,7 +5088,7 @@ msgstr "Neniaj modifoj ĉeestantaj"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Ne"
 
@@ -6046,231 +6059,231 @@ msgid "Visible players: %d"
 msgstr "Videblaj ludantoj: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "EN"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Enretuloj"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "HEL"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Helpo"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "TAS"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Taskoj"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "MS"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Mortiga statistiko"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Mienetoj"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "BAB"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Stato"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "SUR"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Surhavaro"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "OBJ"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr "ĈAR"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "SCI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Scipovoj"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Socia"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "FK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "SOR"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "DEM"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "ĈVS"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Ĉu vi sciis"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "NEG"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "VES"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr "ĜIS"
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr "Ĝisdatigoj"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr "BAN"
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banko"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr "POŜ"
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr "Poŝto"
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "CIM"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "FEN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "AG"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Agordoj"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6658,7 +6671,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Jes"
 
diff --git a/po/es.po b/po/es.po
index 09ff2e6a9..0c43e897b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Nelson Martell <nelson6e65@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
@@ -394,7 +394,7 @@ msgstr "General"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
@@ -824,8 +824,8 @@ msgstr "Lejos del Teclado"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -877,7 +877,7 @@ msgstr "(F) modo de cámara libre"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -891,25 +891,32 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "¿Quieres abrir la página de soporte?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Mensaje"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Revivir"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Revivir"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -917,7 +924,7 @@ msgstr ""
 "salud."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
@@ -1847,7 +1854,7 @@ msgstr "Restaurar cámara"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Vestimenta"
@@ -1867,7 +1874,7 @@ msgstr "Limpiar vestimenta"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Hechizos"
 
@@ -2324,7 +2331,7 @@ msgstr "Desatender"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -2445,7 +2452,7 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Tirar"
@@ -2486,7 +2493,7 @@ msgstr "Atributos"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2504,7 +2511,7 @@ msgstr "Almacenamiento"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2876,7 +2883,7 @@ msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Atajos"
 
@@ -2885,7 +2892,7 @@ msgstr "Atajos"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Ventanas"
 
@@ -2908,7 +2915,7 @@ msgstr "Emotes"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Chat"
 
@@ -2920,7 +2927,7 @@ msgstr "Chat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3376,7 +3383,7 @@ msgstr "%s ahora está Desconectado."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4731,7 +4738,7 @@ msgstr "Apuntar cíclicamente a los monstruos, no necesariamente al más cercano
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4906,7 +4913,7 @@ msgstr "Habilitar notificaciones de peso"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4986,124 +4993,130 @@ msgstr "Habilitar el método alternativo de alt-tab"
 msgid "Shortcut buttons"
 msgstr "Atajos"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Atajos"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Tipo de proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Dirección de proxy:puerto"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr "Túnel a través del proxy HTTP"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr "Iniciando sesión"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr "Habilitar comprobación de versión de OpenGL (no deshabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr "Ignorar registro de paquetes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr "Registrar paquetes sin implementar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Habilitar registro OpenGl"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Habilitar registro de entrada"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr "Nivel de registro SDL"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Subir archivo de registro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Habilitar el ataque del lado del servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr "Ocultar enlace a página de soporte al ocurrir un error"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Habilitar doble clics"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Habilitar inspector de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activar la protección de servidores con errores (no deshabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Usar FBO para capturas de pantalla (sólo para opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr "Directorio de capturas de pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Retraso de red entre sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Mostrar fondo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Sobrescribir densidad de pantalla"
 
@@ -5120,7 +5133,7 @@ msgstr "No hay mods presentes"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "No"
 
@@ -6095,231 +6108,231 @@ msgid "Visible players: %d"
 msgstr "Jugadores visibles: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Quién está conectado"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Ayuda"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Misiones"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Estadísticas"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Emotíconos"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Estado"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipamiento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr "CA"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "¿Sabías que..."
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr "UP"
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr "Actualizaciones"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr "BA"
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banco"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr "MA"
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr "Correo"
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr "IS"
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr "Información del servidor"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6716,7 +6729,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Sí"
 
diff --git a/po/fi.po b/po/fi.po
index 64cda9483..01b50e0ba 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
@@ -372,7 +372,7 @@ msgstr "Yleiset"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -802,8 +802,8 @@ msgstr "Poissa"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -855,7 +855,7 @@ msgstr "(F) vapaa kamera"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -869,31 +869,37 @@ msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Viesti"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+msgid "GM revive"
+msgstr ""
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 
@@ -1822,7 +1828,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
@@ -1842,7 +1848,7 @@ msgstr "Poista asu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Loitsut"
 
@@ -2299,7 +2305,7 @@ msgstr "Vaimenna"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ohita"
 
@@ -2420,7 +2426,7 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Pudota"
@@ -2461,7 +2467,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2479,7 +2485,7 @@ msgstr "Varasto"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2851,7 +2857,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
@@ -2860,7 +2866,7 @@ msgstr "Pikavalinnat"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2883,7 +2889,7 @@ msgstr ""
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Keskustelu"
 
@@ -2895,7 +2901,7 @@ msgstr "Keskustelu"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3351,7 +3357,7 @@ msgstr ""
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4568,7 +4574,7 @@ msgstr "Vaihda hirviökohteita syklissä"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4743,7 +4749,7 @@ msgstr ""
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4820,124 +4826,129 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+msgid "Show icons on shortcut buttons"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Ota käyttöön bugisten palvelinten suojaus (älä poista käytöstä)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Näytä tausta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4954,7 +4965,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Ei"
 
@@ -5920,231 +5931,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "LIN"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Kuka on linjoilla"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Apua"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "TT"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Tappotilastot"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Hymiöt"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "Tie"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Hahmon tiedot"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "Var"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Varusteet"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "Tav"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "Tai"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Taidot"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "Sos"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Suhteet"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "PV"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "Lo"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "Pu"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "T?"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Tiesitkö"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "Ase"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6532,7 +6543,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Kyllä"
 
diff --git a/po/fr.po b/po/fr.po
index 4b2133cfa..48ae85687 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-04-23 20:57+0000\n"
 "Last-Translator: Lucas Helaine <lucashelaine14@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
@@ -401,7 +401,7 @@ msgstr "Général"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Débogage"
@@ -832,8 +832,8 @@ msgstr "Inactif"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -885,7 +885,7 @@ msgstr "(F) Mode camera libre"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -899,25 +899,32 @@ msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Veux-tu ouvrir la page d'aide ?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Message"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Ressusciter"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Ressusciter"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -925,7 +932,7 @@ msgstr ""
 "en mesure de récupérer ta santé."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Tu portes moins de la moitié du poids maximal de ton inventaire. Tu peux "
@@ -1856,7 +1863,7 @@ msgstr "Restorer la caméra"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Costumes"
@@ -1876,7 +1883,7 @@ msgstr "Effacer la tenue"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Sortilèges"
 
@@ -2333,7 +2340,7 @@ msgstr "Éviter"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -2454,7 +2461,7 @@ msgstr "Abandonner tout..."
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Abandonner"
@@ -2495,7 +2502,7 @@ msgstr "Statistiques"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2513,7 +2520,7 @@ msgstr "Entrepôt"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2885,7 +2892,7 @@ msgstr "Basique"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
@@ -2894,7 +2901,7 @@ msgstr "Raccourcis"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fenêtres"
 
@@ -2917,7 +2924,7 @@ msgstr "Emoticônes"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Conversation"
 
@@ -2929,7 +2936,7 @@ msgstr "Conversation"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3385,7 +3392,7 @@ msgstr "%s est maintenant Hors Ligne."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr "Clan"
@@ -4749,7 +4756,7 @@ msgstr "Sélectionner les monstres par ordre de distance"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4924,7 +4931,7 @@ msgstr "Activer les notifications de poids"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -5002,124 +5009,130 @@ msgstr "Activer le palliatif alt-tab"
 msgid "Shortcut buttons"
 msgstr "Boutons de raccourcis"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Boutons de raccourcis"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Serveur proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Type de proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Adresse du proxy:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr "Tunnel à travers le proxy HTTP"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr "Diagraphie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr "Activer la vérification de version d'OpenGL (ne pas désactiver)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Activer l'historique des informations de débogage"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr "Ignorer les paquets d'identification"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr "HIstorique des paquets non implémentés"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Activer historique OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Activer l'historique des saisies"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr "Niveau de diagraphie SDL"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Mettre en ligne le fichier d'historique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr "Cacher le lien de la page d'aide quand erreur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Activer double-cliques"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activer la protection pour serveurs defaillant (ne pas désactiver)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utiliser FBO pour les captures d'écran (seulement pour OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr "Répertoire des captures d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Retard du réseau entre les sous-serveurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Montrer le fond"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Écrasement de la densité de l'écran"
 
@@ -5136,7 +5149,7 @@ msgstr "Pas de mods présent"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Non"
 
@@ -6118,231 +6131,231 @@ msgid "Visible players: %d"
 msgstr "Joueurs visibles : %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "OnL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Qui est en ligne"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "AID"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Aide"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Quêtes"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "Sta"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Tuer les statistiques"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Émoticône"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Statut"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "Equ"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Équipement"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "Inv"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr "CA"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "CRT"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "Cmp"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Compétences"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "Soc"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "Rac"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "Sor"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "Jet"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Connaissais-tu le"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "BTQ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "TNU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr "MAJ"
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr "Mises à jour"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr "CB"
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banque"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr "MA"
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr "Mail"
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr "CL"
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr "SI"
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr "Informations du serveur"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "FEN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "Cfg"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6735,7 +6748,7 @@ msgid "Antagonist"
 msgstr "Antagoniste"
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Oui"
 
diff --git a/po/id.po b/po/id.po
index 2efb14fe9..2c0f0e22b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Aviv wahyudin <apip45@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
@@ -374,7 +374,7 @@ msgstr "Umum"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -804,8 +804,8 @@ msgstr "Pergi"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -857,7 +857,7 @@ msgstr "(F) mode kamera bebas"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -871,32 +871,39 @@ msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Kamu ingin membuka halaman bantuan?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Pesan"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Hidupkan"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Hidupkan"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Kamu memmbawa lebih dari separuh beratmu. Kamu tidak bisa regenerasidarah."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Kamu membawa kurang dari separuh beratmu. Kamu bisa regenerasi darah."
 
@@ -1825,7 +1832,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Perlengkapan"
@@ -1845,7 +1852,7 @@ msgstr "Bersihkan perlengkapan"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Mantra"
 
@@ -2302,7 +2309,7 @@ msgstr "Abaikan"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Abaikan"
 
@@ -2423,7 +2430,7 @@ msgstr "Buang semua"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Buang"
@@ -2464,7 +2471,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2482,7 +2489,7 @@ msgstr "Tempat penyimpanan"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2854,7 +2861,7 @@ msgstr "Dasar"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Tombol cepat"
 
@@ -2863,7 +2870,7 @@ msgstr "Tombol cepat"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Jendela"
 
@@ -2886,7 +2893,7 @@ msgstr "Emosi"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Obrolan"
 
@@ -2898,7 +2905,7 @@ msgstr "Obrolan"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3354,7 +3361,7 @@ msgstr "%s sekarang Offline."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4571,7 +4578,7 @@ msgstr "Tandai target monster"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4746,7 +4753,7 @@ msgstr ""
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4823,124 +4830,129 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+msgid "Show icons on shortcut buttons"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4957,7 +4969,7 @@ msgstr "Tak ada modif"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Tidak"
 
@@ -5922,231 +5934,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr ""
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Bantuan"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Stat membunuh"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Emotikon"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr ""
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Perlengkapan"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Keahlian"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Apakah kamu tahu"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6534,7 +6546,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Ya"
 
diff --git a/po/it.po b/po/it.po
index 7aac64130..5c8b93cb8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: crifxer .\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
@@ -384,7 +384,7 @@ msgstr "Generale"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -814,8 +814,8 @@ msgstr "Assente"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -867,7 +867,7 @@ msgstr "(F) Modalita' camera libera"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -881,25 +881,31 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Messaggio"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+msgid "GM revive"
+msgstr ""
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -907,7 +913,7 @@ msgstr ""
 "vita."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
@@ -1837,7 +1843,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Attrezzatura"
@@ -1857,7 +1863,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Spells"
 
@@ -2314,7 +2320,7 @@ msgstr "Ignora"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -2435,7 +2441,7 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Lascia"
@@ -2476,7 +2482,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2494,7 +2500,7 @@ msgstr "Magazzino"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2866,7 +2872,7 @@ msgstr "Base"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
@@ -2875,7 +2881,7 @@ msgstr "Shortcuts"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Finestre"
 
@@ -2898,7 +2904,7 @@ msgstr "Faccine"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Chat"
 
@@ -2910,7 +2916,7 @@ msgstr "Chat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3366,7 +3372,7 @@ msgstr "%s si è disconnesso."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4585,7 +4591,7 @@ msgstr "Ciclo di target sui nemici"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4760,7 +4766,7 @@ msgstr ""
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4837,124 +4843,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Mostra bottoni sullo schermo"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Server Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Tipologia Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Proxy indirizzo:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Abilita i log di debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Attiva registro attivita' OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Attiva attacchi server-side"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Abilita il bot checker"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Modalità basso traffico"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Usa FBO, Frame Buffer Object (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Mostra sfondo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4971,7 +4983,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "No"
 
@@ -5942,231 +5954,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Chi è online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Aiuto"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Missioni"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Statistiche uccisioni"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Faccine"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Stato"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Abilità"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Sociale"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Suggerimenti"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6554,7 +6566,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Sì"
 
diff --git a/po/ja.po b/po/ja.po
index 0bb7d2e75..cb6f071a0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
@@ -378,7 +378,7 @@ msgstr "一般"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "デバッグ"
@@ -808,8 +808,8 @@ msgstr "アウェイ"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -861,7 +861,7 @@ msgstr "(F) フリーカメラモード"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -875,31 +875,37 @@ msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "メッセージ"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+msgid "GM revive"
+msgstr ""
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "インベントリーが体重の半分以上の為、体力は回復できません."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "インベントリーが体重の半分以下になった為、体力は回復します."
 
@@ -1828,7 +1834,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "服装"
@@ -1848,7 +1854,7 @@ msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "呪文"
 
@@ -2305,7 +2311,7 @@ msgstr "無視する"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "無視"
 
@@ -2426,7 +2432,7 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "落とす"
@@ -2467,7 +2473,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2485,7 +2491,7 @@ msgstr "倉庫"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2857,7 +2863,7 @@ msgstr "基本"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "ショートカット"
 
@@ -2866,7 +2872,7 @@ msgstr "ショートカット"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "ウィンドウ"
 
@@ -2889,7 +2895,7 @@ msgstr "スマイリー"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "チャット"
 
@@ -2901,7 +2907,7 @@ msgstr "チャット"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3357,7 +3363,7 @@ msgstr ""
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4576,7 +4582,7 @@ msgstr "選択したモンスターを円で表示"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4751,7 +4757,7 @@ msgstr ""
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4828,124 +4834,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr "ショートカットボタン"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "ショートカットボタン"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "プロキシサーバー"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "プロキシタイプ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "プロキシアドレス:ポート"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "デバッグログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "OpenGLログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "入力ログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "サーバーサイドアタックを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "ボットチェッカーを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "不安定なサーバー保護を有効にする(無効にしない)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "低トラフィックモード"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "スクリーンショットにFBOを使う (OpenGLのみ)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "背景を表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4962,7 +4974,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "いいえ"
 
@@ -5927,231 +5939,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "オンラインリスト"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "ヘルプ"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "クエスト"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "キル統計"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "スマイリー"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "ステータス"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "装着品"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "地図"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "スキル"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "ソーシャル"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "豆知識"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6539,7 +6551,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "はい"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 40d698a2b..2b63a97b2 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: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+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"
@@ -369,7 +369,7 @@ msgstr ""
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
@@ -799,8 +799,8 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -852,7 +852,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -866,31 +866,37 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+msgid "GM revive"
+msgstr ""
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -1819,7 +1825,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr ""
@@ -1839,7 +1845,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr ""
 
@@ -2296,7 +2302,7 @@ msgstr ""
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr ""
 
@@ -2417,7 +2423,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr ""
@@ -2458,7 +2464,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2476,7 +2482,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2848,7 +2854,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr ""
 
@@ -2857,7 +2863,7 @@ msgstr ""
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2880,7 +2886,7 @@ msgstr ""
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr ""
 
@@ -2892,7 +2898,7 @@ msgstr ""
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3348,7 +3354,7 @@ msgstr ""
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4561,7 +4567,7 @@ msgstr ""
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4736,7 +4742,7 @@ msgstr ""
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4813,124 +4819,129 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+msgid "Show icons on shortcut buttons"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4947,7 +4958,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr ""
 
@@ -5912,231 +5923,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr ""
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr ""
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr ""
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6523,7 +6534,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 8868f12d4..580989dbc 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -373,7 +373,7 @@ msgstr "Algemeen"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -803,8 +803,8 @@ msgstr "Weg"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -856,7 +856,7 @@ msgstr "(F) vrije camera modus"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -870,25 +870,31 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Bericht"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+msgid "GM revive"
+msgstr ""
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -896,7 +902,7 @@ msgstr ""
 "herstellen."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -1825,7 +1831,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Kleren"
@@ -1845,7 +1851,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Spreuken"
 
@@ -2302,7 +2308,7 @@ msgstr "Geen rekening mee houden"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Negeer"
 
@@ -2423,7 +2429,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Neerleggen"
@@ -2464,7 +2470,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2482,7 +2488,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2854,7 +2860,7 @@ msgstr "Basis"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
@@ -2863,7 +2869,7 @@ msgstr "Snelkoppeling"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Vensters"
 
@@ -2886,7 +2892,7 @@ msgstr ""
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Chat"
 
@@ -2898,7 +2904,7 @@ msgstr "Chat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3354,7 +3360,7 @@ msgstr ""
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4570,7 +4576,7 @@ msgstr "Doorloop monsterdoelwitten"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4745,7 +4751,7 @@ msgstr ""
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4822,124 +4828,129 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+msgid "Show icons on shortcut buttons"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Aanval gecontroleerd door server aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Bot controle aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Laag verkeer modus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Toon achtergrond"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4956,7 +4967,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Nee"
 
@@ -5927,231 +5938,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Wie is online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Help"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "UITR"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "VAAR"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Vaardigheden"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Sociaal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "NL"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "WU"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Weet u"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "WINKEL"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "KL"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "CONF"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6539,7 +6550,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Ja"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 8868f12d4..580989dbc 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -373,7 +373,7 @@ msgstr "Algemeen"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -803,8 +803,8 @@ msgstr "Weg"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -856,7 +856,7 @@ msgstr "(F) vrije camera modus"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -870,25 +870,31 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Bericht"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+msgid "GM revive"
+msgstr ""
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -896,7 +902,7 @@ msgstr ""
 "herstellen."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -1825,7 +1831,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Kleren"
@@ -1845,7 +1851,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Spreuken"
 
@@ -2302,7 +2308,7 @@ msgstr "Geen rekening mee houden"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Negeer"
 
@@ -2423,7 +2429,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Neerleggen"
@@ -2464,7 +2470,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2482,7 +2488,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2854,7 +2860,7 @@ msgstr "Basis"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
@@ -2863,7 +2869,7 @@ msgstr "Snelkoppeling"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Vensters"
 
@@ -2886,7 +2892,7 @@ msgstr ""
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Chat"
 
@@ -2898,7 +2904,7 @@ msgstr "Chat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3354,7 +3360,7 @@ msgstr ""
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4570,7 +4576,7 @@ msgstr "Doorloop monsterdoelwitten"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4745,7 +4751,7 @@ msgstr ""
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4822,124 +4828,129 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+msgid "Show icons on shortcut buttons"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Aanval gecontroleerd door server aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Bot controle aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Laag verkeer modus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Toon achtergrond"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4956,7 +4967,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Nee"
 
@@ -5927,231 +5938,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Wie is online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Help"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "UITR"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "VAAR"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Vaardigheden"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Sociaal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "NL"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "WU"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Weet u"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "WINKEL"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "KL"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "CONF"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6539,7 +6550,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Ja"
 
diff --git a/po/pl.po b/po/pl.po
index f23d22d23..79063da4b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
@@ -380,7 +380,7 @@ msgstr "Ogólny"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -810,8 +810,8 @@ msgstr "AFK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -863,7 +863,7 @@ msgstr "(F) wolny tryb kamery"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -877,32 +877,39 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Czy chcesz otworzyć stronę ze wsparciem/pomocą?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Wiadomość"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Wskrześ"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Wskrześ"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać "
@@ -1833,7 +1840,7 @@ msgstr "Przywróć kamerę"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Stroje"
@@ -1853,7 +1860,7 @@ msgstr "Usuń ubiór"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Zaklęcia"
 
@@ -2310,7 +2317,7 @@ msgstr "Lekceważ"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignoruj"
 
@@ -2431,7 +2438,7 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Upuść"
@@ -2472,7 +2479,7 @@ msgstr "Statystyki"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2490,7 +2497,7 @@ msgstr "Magazyn"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2862,7 +2869,7 @@ msgstr "Podstawowe"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Skróty"
 
@@ -2871,7 +2878,7 @@ msgstr "Skróty"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Okna"
 
@@ -2894,7 +2901,7 @@ msgstr "Emotki"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Czat"
 
@@ -2906,7 +2913,7 @@ msgstr "Czat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3362,7 +3369,7 @@ msgstr "%s jest teraz Offline."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4581,7 +4588,7 @@ msgstr "Przewijaj namierzanie potworów"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4756,7 +4763,7 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4833,124 +4840,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr "Guziki skrótów"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Guziki skrótów"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Serwer proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Rodzaj proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Adres serwera:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Włącz logowanie Debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Włącz logowanie OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Aktywuj logowanie wejścia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Wyślij plik dziennika"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Włącz atak ze strony serwera"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr "Ukryj stronę wsparcia po wystąpieniu błędu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Aktywuj podwójne kliknięcia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Włącz wykrywacza botów"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Włącz ochronę przeciw zbugowanym serwerom"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Tryb niskiego transferu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Używaj FBO do screenshotów (tylko w OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr "Folder zrzutów ekranu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Opóźnienie sieci między podserwerami"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Pokazuj tło"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Nadpisanie gęstości ekranu"
 
@@ -4967,7 +4980,7 @@ msgstr "Brak modów"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Nie"
 
@@ -5939,231 +5952,231 @@ msgid "Visible players: %d"
 msgstr "Widoczni gracze: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Gracze online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "PMC"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "OM"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Misje"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "SB"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Statystyki ataku:"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Emotki"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "TX"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Stan"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EKW"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Ekwipunek"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INW"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Zdolności"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Społeczność"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "MG"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "UP"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "WŻ"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Czy wiesz, że..."
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "SKP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "SÓ"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr "AKT"
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr "Aktualizacje"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "OKN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6551,7 +6564,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Tak"
 
diff --git a/po/pt.po b/po/pt.po
index a4fef3509..7c659a1eb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: João Pereira <joaocrpereira@hotmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
@@ -380,7 +380,7 @@ msgstr "Geral"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
@@ -810,8 +810,8 @@ msgstr "Indisponivel"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -863,7 +863,7 @@ msgstr "(F) Modo de jogo câmera livre"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -877,25 +877,31 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Mensagem"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+msgid "GM revive"
+msgstr ""
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -903,7 +909,7 @@ msgstr ""
 "recuperar HP."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Você está carregando menos da metade de seu peso. Você vai recuperar-se "
@@ -1834,7 +1840,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Roupas"
@@ -1854,7 +1860,7 @@ msgstr "Limpar equipamento"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Feitiços"
 
@@ -2311,7 +2317,7 @@ msgstr "Ser inimigo(a)"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -2432,7 +2438,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Descartar"
@@ -2473,7 +2479,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2491,7 +2497,7 @@ msgstr "Armazém"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2863,7 +2869,7 @@ msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Atalhos"
 
@@ -2872,7 +2878,7 @@ msgstr "Atalhos"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2895,7 +2901,7 @@ msgstr "Emoções"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Chat"
 
@@ -2907,7 +2913,7 @@ msgstr "Chat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3363,7 +3369,7 @@ msgstr "%s está offline."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4582,7 +4588,7 @@ msgstr "Alvo de monstros em ciclo"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4757,7 +4763,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4834,124 +4840,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr "Botões de atalho"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Botões de atalho"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Servidor Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Ativar LOG OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Habilitar log de entrada"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção contra bugs no servidor (não desabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Atraso de rede entre os sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Substituição de densidade de tela"
 
@@ -4968,7 +4980,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Não"
 
@@ -5937,231 +5949,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Quem esta online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "AJD"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "MSS"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Missões"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "EST"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Estatísticas"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Smileys"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "JC"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "AT"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "FE"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "DE"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "VS"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Você sabia"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6549,7 +6561,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Sim"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1457f89a0..a9419ec3c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-06 00:15+0000\n"
 "Last-Translator: Diogo RBG <diogorbg@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
@@ -393,7 +393,7 @@ msgstr "Geral"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
@@ -823,8 +823,8 @@ msgstr "Indisponivel"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -876,7 +876,7 @@ msgstr "(F) Modo de jogo câmera livre"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -890,25 +890,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Você quer abrir a página de suporte?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Mensagem"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Reviver"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Reviver"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -916,7 +923,7 @@ msgstr ""
 "recuperar HP."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Você está carregando menos ou metade de seu peso. Você pode recuperar-se "
@@ -1847,7 +1854,7 @@ msgstr "Restaurar câmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Roupas"
@@ -1867,7 +1874,7 @@ msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Feitiços"
 
@@ -2324,7 +2331,7 @@ msgstr "Ser inimigo(a)"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -2445,7 +2452,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Descartar"
@@ -2486,7 +2493,7 @@ msgstr "Status"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2504,7 +2511,7 @@ msgstr "Armazém"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2876,7 +2883,7 @@ msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Atalhos"
 
@@ -2885,7 +2892,7 @@ msgstr "Atalhos"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2908,7 +2915,7 @@ msgstr "Emoticons"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Chat"
 
@@ -2920,7 +2927,7 @@ msgstr "Chat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3376,7 +3383,7 @@ msgstr "%s estão offline."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4727,7 +4734,7 @@ msgstr "Alvo de monstros em ciclo"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4902,7 +4909,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4979,124 +4986,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr "botões de atalho"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "botões de atalho"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr "Habilitar verificação de versão OpenGL (não desabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr "Ignorar pacotes de registro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Ativar LOG OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Habilitar log de entrada"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Arquivo de registro enviado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr "Esconder link da página de suporte em erros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Habilitar duplo clique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção para servidores com bugs (não desabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr "Diretório de captura de tela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Atraso de rede entre sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Ultrapassar Densidade da tela"
 
@@ -5113,7 +5126,7 @@ msgstr "Sem mods disponíveis"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Não"
 
@@ -6086,231 +6099,231 @@ msgid "Visible players: %d"
 msgstr "Jogadores visíveis: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Quem esta online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "AJU"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "MSS"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Missões"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "EST"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Estatísticas"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Carinhas"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr "CA"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "AT"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "FE"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "DE"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Você Sabia"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "LOJ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "RO"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr "CIMA"
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr "Atualizações"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr "BA"
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banco"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr "MA"
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr "Correio"
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6698,7 +6711,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Sim"
 
diff --git a/po/ru.po b/po/ru.po
index b81bc7f57..c430af9f9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Alexsl <alexlsh@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
@@ -389,7 +389,7 @@ msgstr "Общие"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Отладка"
@@ -819,8 +819,8 @@ msgstr "Отошел"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -872,7 +872,7 @@ msgstr "(F) свободная камера"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -886,25 +886,32 @@ msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Открыть страницу поддержки?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Сообщение"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Оживить"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Оживить"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -912,7 +919,7 @@ msgstr ""
 "восстанавливаться не будет."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Вес предметов составляет менее половины допустимого. Теперь Вы можете "
@@ -1843,7 +1850,7 @@ msgstr "Восстановить камеру"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Наряды"
@@ -1863,7 +1870,7 @@ msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Заклинания"
 
@@ -2320,7 +2327,7 @@ msgstr "Пренебречь"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Игнорировать"
 
@@ -2441,7 +2448,7 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Бросить"
@@ -2482,7 +2489,7 @@ msgstr "Статы"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2500,7 +2507,7 @@ msgstr "Хранилище"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2872,7 +2879,7 @@ msgstr "Основное"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Горячие клавиши"
 
@@ -2881,7 +2888,7 @@ msgstr "Горячие клавиши"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Окна"
 
@@ -2904,7 +2911,7 @@ msgstr "Смайлы"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Чат"
 
@@ -2916,7 +2923,7 @@ msgstr "Чат"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3372,7 +3379,7 @@ msgstr "%s вышел(а)."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4623,7 +4630,7 @@ msgstr "Прокручивать прицел по монстрам"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4798,7 +4805,7 @@ msgstr "Включить напоминание о весе"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4875,124 +4882,130 @@ msgstr "Включить alt-tab прокрутку"
 msgid "Shortcut buttons"
 msgstr "Кнопки"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Кнопки"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Прокси сервер"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Тип прокси"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Прокси адрес:порт"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr "Логирование"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr "Включить проверку версии OpenGL (не выключать)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr "Исключить из логгирования пакеты"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr "Сохранять нереализованные пакеты"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Включить лог OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Включить лог ввода"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr "уровень логирования SDL"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Выгрузить лог файл"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr "При выводе ошибки, прятать ссылку на страницу поддержки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Включить поддержку двойного клика"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Включить защиту от бажных серверов (не выключать!)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Режим кеширования игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Использовать FBO для скриншотов (только в режиме opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr "Путь для снимков экрана"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Задержка между сетевыми соединениями"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Показать фон"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Переопределение плотности экрана"
 
@@ -5009,7 +5022,7 @@ msgstr "Для данного сервера моды не существуют"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Нет"
 
@@ -5987,231 +6000,231 @@ msgid "Visible players: %d"
 msgstr "Видимых игроков: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "КО"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Кто онлайн"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "СПР"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Помощь"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "КВ"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Квесты"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "СА"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Статистика убийств"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Смайлы"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "ЧАТ"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "СО"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Состояние"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "СН"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Снаряжение"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "ИНВ"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr "ТЕ"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "КАР"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "УМ"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Навыки"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "ОБЩ"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Общество"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "ГК"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "ЗАК"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "БР"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "ВЗ"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Знаете ли вы"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "МАГ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "НАР"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr "ОБ"
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr "Обновления"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr "БА"
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Банк"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr "ПО"
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr "Почта"
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr "ИС"
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr "Информация о сервере"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "ОТЛ"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "ОКН"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "ОПЦ"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6599,7 +6612,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Да"
 
diff --git a/po/sr.po b/po/sr.po
index cfeeeebee..e6bdab879 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
@@ -373,7 +373,7 @@ msgstr "Opšte"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -803,8 +803,8 @@ msgstr "Nedostupan"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -856,7 +856,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -870,31 +870,37 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+msgid "GM revive"
+msgstr ""
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -1823,7 +1829,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr ""
@@ -1843,7 +1849,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr ""
 
@@ -2300,7 +2306,7 @@ msgstr ""
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignoriši"
 
@@ -2421,7 +2427,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr ""
@@ -2462,7 +2468,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2480,7 +2486,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2852,7 +2858,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr ""
 
@@ -2861,7 +2867,7 @@ msgstr ""
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Prozori"
 
@@ -2884,7 +2890,7 @@ msgstr ""
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Ćaskanje"
 
@@ -2896,7 +2902,7 @@ msgstr "Ćaskanje"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3352,7 +3358,7 @@ msgstr ""
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4568,7 +4574,7 @@ msgstr ""
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4743,7 +4749,7 @@ msgstr ""
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4820,124 +4826,129 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+msgid "Show icons on shortcut buttons"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Režim niskog protoka"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Prikaži pozadinu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4954,7 +4965,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Ne"
 
@@ -5919,231 +5930,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Ko je dostupan"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Pomoć"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr ""
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Oprema"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Veštine"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6531,7 +6542,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Da"
 
diff --git a/po/sv.po b/po/sv.po
index 58401a238..4c0bfdf4b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Kristoffer Frisell <kristoffer@frisell.it>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -373,7 +373,7 @@ msgstr "General"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -803,8 +803,8 @@ msgstr "Iväg"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -856,7 +856,7 @@ msgstr "(F) fritt kamera-läge"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -870,31 +870,38 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Vill du öppna support-sidan?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Meddelande"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Återuppliva"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Återuppliva"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 
@@ -1823,7 +1830,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -1843,7 +1850,7 @@ msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Spells"
 
@@ -2300,7 +2307,7 @@ msgstr "Ignorera"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignorera"
 
@@ -2421,7 +2428,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Släng"
@@ -2462,7 +2469,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2480,7 +2487,7 @@ msgstr "Storage"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2852,7 +2859,7 @@ msgstr "Enkel"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Genvägar"
 
@@ -2861,7 +2868,7 @@ msgstr "Genvägar"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fönster"
 
@@ -2884,7 +2891,7 @@ msgstr "Emotes"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Chat"
 
@@ -2896,7 +2903,7 @@ msgstr "Chat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3352,7 +3359,7 @@ msgstr "%s är nu Offline."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4571,7 +4578,7 @@ msgstr "Cycle monsters targets"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4746,7 +4753,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4824,124 +4831,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr "Genvägsknappar"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Genvägsknappar"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Proxy-server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Proxy-typ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Proxy-adress:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Aktivera debug-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Aktivera OpenGL-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Aktivera inputs-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Aktivera serversideattack"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Aktivera dubbleklick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Aktivera bot checker"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Aktivera buggig-server-skydd (ändra inte denna är du snäll)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Lågtrafik-mode"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Använd FBO för skärmdumpar (bara för openGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Nätverksfördröjning mellan underservrar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Visa bakgrund"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Skärmdensitet överskrids"
 
@@ -4958,7 +4971,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Nej"
 
@@ -5927,231 +5940,231 @@ msgid "Visible players: %d"
 msgstr "Synliga spelare: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Vem är online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Uppdrag"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Dödsstatistik"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipment"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Skills"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Visste du att"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6539,7 +6552,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Ja"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 58401a238..4c0bfdf4b 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Kristoffer Frisell <kristoffer@frisell.it>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -373,7 +373,7 @@ msgstr "General"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -803,8 +803,8 @@ msgstr "Iväg"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -856,7 +856,7 @@ msgstr "(F) fritt kamera-läge"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -870,31 +870,38 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Vill du öppna support-sidan?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Meddelande"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Återuppliva"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Återuppliva"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 
@@ -1823,7 +1830,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -1843,7 +1850,7 @@ msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Spells"
 
@@ -2300,7 +2307,7 @@ msgstr "Ignorera"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ignorera"
 
@@ -2421,7 +2428,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Släng"
@@ -2462,7 +2469,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2480,7 +2487,7 @@ msgstr "Storage"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2852,7 +2859,7 @@ msgstr "Enkel"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Genvägar"
 
@@ -2861,7 +2868,7 @@ msgstr "Genvägar"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fönster"
 
@@ -2884,7 +2891,7 @@ msgstr "Emotes"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Chat"
 
@@ -2896,7 +2903,7 @@ msgstr "Chat"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3352,7 +3359,7 @@ msgstr "%s är nu Offline."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4571,7 +4578,7 @@ msgstr "Cycle monsters targets"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4746,7 +4753,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4824,124 +4831,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr "Genvägsknappar"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Genvägsknappar"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Proxy-server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Proxy-typ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Proxy-adress:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Aktivera debug-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Aktivera OpenGL-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Aktivera inputs-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Aktivera serversideattack"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Aktivera dubbleklick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Aktivera bot checker"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Aktivera buggig-server-skydd (ändra inte denna är du snäll)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Lågtrafik-mode"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Använd FBO för skärmdumpar (bara för openGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Nätverksfördröjning mellan underservrar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Visa bakgrund"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Skärmdensitet överskrids"
 
@@ -4958,7 +4971,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Nej"
 
@@ -5927,231 +5940,231 @@ msgid "Visible players: %d"
 msgstr "Synliga spelare: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ONL"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Vem är online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Uppdrag"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Dödsstatistik"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "STA"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipment"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Skills"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Visste du att"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6539,7 +6552,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Ja"
 
diff --git a/po/tr.po b/po/tr.po
index c1871c23a..22d84f617 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Oben Devin Çetiner <hiironohige@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
@@ -372,7 +372,7 @@ msgstr "Genel"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Hata ayıklama"
@@ -802,8 +802,8 @@ msgstr "Uzakta"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -855,7 +855,7 @@ msgstr "(F) serbest kamera modu"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -869,25 +869,32 @@ msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Destek sayfasını açmak ister misin?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Mesaj"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Dirilt"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Dirilt"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -895,7 +902,7 @@ msgstr ""
 "iyileşemiyorsun."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Ağırlığının yarısından daha hafif eşya taşıyorsun. Kendiliğinden "
@@ -1826,7 +1833,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Kıyafetler"
@@ -1846,7 +1853,7 @@ msgstr "Kıyafetlerin hepsini çıkart"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Büyüler"
 
@@ -2303,7 +2310,7 @@ msgstr "İhmal et"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Görmezden gel"
 
@@ -2424,7 +2431,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Bırak"
@@ -2465,7 +2472,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2483,7 +2490,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2855,7 +2862,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
@@ -2864,7 +2871,7 @@ msgstr "Kısayollar"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2887,7 +2894,7 @@ msgstr ""
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Sohbet"
 
@@ -2899,7 +2906,7 @@ msgstr "Sohbet"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3355,7 +3362,7 @@ msgstr ""
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4573,7 +4580,7 @@ msgstr "Canavar hedeflerini sırayla değiştir"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4748,7 +4755,7 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4825,124 +4832,129 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+msgid "Show icons on shortcut buttons"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Hata ayıklama modunu etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Sunucu yan saldırılarını etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Bot Kontrolörünü etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Düşük trafik modu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Arkaplanı göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4959,7 +4971,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Hayır"
 
@@ -5924,231 +5936,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "KO"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Kimler Online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Yardım"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "Öİ"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Öldürme istatistikleri"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "DRM"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Durum"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "EKP"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Ekipman"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "ENV"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "YTN"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Yetenekler"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "SOS"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Sosyal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "KY"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "BY"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "AYR"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6536,7 +6548,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Evet"
 
diff --git a/po/uk.po b/po/uk.po
index df508f406..1b54be06c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: William Lee <v4r@trioptimum.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
@@ -379,7 +379,7 @@ msgstr "Загальне"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Зневадження"
@@ -809,8 +809,8 @@ msgstr "Відсутній"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -862,7 +862,7 @@ msgstr "(F) вільний режим камери"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -876,25 +876,32 @@ msgid "Close"
 msgstr "Закрити"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "Чи бажаєте відвідати сторінку підтримки?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "Повідомлення"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "Опритомнити"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "Опритомнити"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -902,7 +909,7 @@ msgstr ""
 "зможете відновлюватися."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Ви навантажені менш, ніж на половину. Тепер ви можете відновлюватися."
 
@@ -1831,7 +1838,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Швидке спорядження"
@@ -1851,7 +1858,7 @@ msgstr "Видалити швидке спорядження"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "Заклинання"
 
@@ -2308,7 +2315,7 @@ msgstr "Зневажати"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "Ігнорувати"
 
@@ -2429,7 +2436,7 @@ msgstr "Кинути все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Кинути"
@@ -2470,7 +2477,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2488,7 +2495,7 @@ msgstr "Сховище"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2860,7 +2867,7 @@ msgstr "Загальне"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "Швидкі клавіші"
 
@@ -2869,7 +2876,7 @@ msgstr "Швидкі клавіші"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Вікна"
 
@@ -2892,7 +2899,7 @@ msgstr "Смайлики"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "Чат"
 
@@ -2904,7 +2911,7 @@ msgstr "Чат"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3360,7 +3367,7 @@ msgstr "%s вийшов з гри."
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4579,7 +4586,7 @@ msgstr "Прокручувати мобів по колу"
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4754,7 +4761,7 @@ msgstr "Повідомляти про вагове перенавантажен�
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4831,124 +4838,130 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr "Клавіші"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+#, fuzzy
+msgid "Show icons on shortcut buttons"
+msgstr "Клавіші"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr "Проксі сервер"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr "Тип проксі"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr "Проксі хост:порт"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "Ввімкнути лог зневадження"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr "Не вносити в лог мережеві пакети"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr "Ввімкнути OpenGL лог"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr "Ввімкнути лог введення"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Завантажили лог файл"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "Ввімкнути серверну атаку"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr "Не видавати адресу підтримки при помилці"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr "Ввімкнути підтримку подвійних кліків"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "Ввімкнути перевірку ботів"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Ввімкнути захист від глючних серверів (не вимикати!)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "Режим кешування гравців"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Вживати FBO для скріншотів (тільки OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr "Тека скріншотів"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr "Встановити затримку з'єднання між підсерверами"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "Показати фон"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr "Корекція роздільності екрану"
 
@@ -4965,7 +4978,7 @@ msgstr "Немає доступних модів"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "Ні"
 
@@ -5935,231 +5948,231 @@ msgid "Visible players: %d"
 msgstr "Видимих гравців: %d"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr "ХО"
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "Хто онлайн"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr "ДОВ"
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Довідка"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr "КВ"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr "Квести"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr "СА"
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Статистика атак"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "Смайлики"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr "ЧАТ"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr "СТН"
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "Стан"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr "СПР"
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Спорядження"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr "СУМ"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr "МАП"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "ВМІ"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "Вміння"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr "СУС"
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr "Спільнота"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr "ШП"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr "ЗК"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr "ДР"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "ЧВВ"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "Чи вам відомо"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr "КРА"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr "ШС"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr "ОН"
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr "Оновлення"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr "БА"
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Банк"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr "ЗНВ"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr "ВІК"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "НАЛ"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Налаштування"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6547,7 +6560,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Так"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 20469cb98..553e25d77 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -376,7 +376,7 @@ msgstr "常规"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "调试"
@@ -806,8 +806,8 @@ msgstr "距离"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -859,7 +859,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -873,31 +873,37 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "讯息"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr ""
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+msgid "GM revive"
+msgstr ""
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -1826,7 +1832,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "套装"
@@ -1846,7 +1852,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "法术"
 
@@ -2303,7 +2309,7 @@ msgstr ""
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "忽略"
 
@@ -2424,7 +2430,7 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "丢弃"
@@ -2465,7 +2471,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2483,7 +2489,7 @@ msgstr "仓库"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2855,7 +2861,7 @@ msgstr "基础"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "快捷键"
 
@@ -2864,7 +2870,7 @@ msgstr "快捷键"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "窗口"
 
@@ -2887,7 +2893,7 @@ msgstr ""
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "聊天"
 
@@ -2899,7 +2905,7 @@ msgstr "聊天"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3355,7 +3361,7 @@ msgstr ""
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4570,7 +4576,7 @@ msgstr ""
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4745,7 +4751,7 @@ msgstr ""
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4822,124 +4828,129 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+msgid "Show icons on shortcut buttons"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr "显示背景"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4956,7 +4967,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "否"
 
@@ -5921,231 +5932,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr ""
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr "谁在线"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "帮助"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "杀敌统计"
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr "表情符号"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr ""
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "状态"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "装备"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr "技能"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "技能"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr "你知道吗"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6533,7 +6544,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "是"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 25bbea287..04cb5c1e9 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"POT-Creation-Date: 2018-05-22 00:56+0300\n"
 "PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Pak Long Wu <paklongwu1006@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
@@ -370,7 +370,7 @@ msgstr "一般"
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:202
+#: src/game.cpp:299 src/gui/windowmanager.cpp:144 src/gui/windowmenu.cpp:239
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "調試"
@@ -800,8 +800,8 @@ msgstr "暫離鍵盤"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
+#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:205
+#: src/gui/dialogsmanager.cpp:225 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
 #: src/gui/widgets/tabs/setup_video.cpp:277
@@ -853,7 +853,7 @@ msgstr "(F) 自由鏡頭模式"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
-#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
+#: src/gui/dialogsmanager.cpp:120 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
 #: src/gui/windows/didyouknowwindow.cpp:85
 #: src/gui/windows/inventorywindow.cpp:309
@@ -867,31 +867,38 @@ msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:131
+#: src/gui/dialogsmanager.cpp:132
 msgid "Do you want to open support page?"
 msgstr "你想打開幫助頁面嗎?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:146 src/gui/dialogsmanager.cpp:180
-#: src/gui/dialogsmanager.cpp:200
+#: src/gui/dialogsmanager.cpp:149 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:199 src/gui/dialogsmanager.cpp:219
 msgid "Message"
 msgstr "訊息"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2995
+#: src/gui/dialogsmanager.cpp:152 src/gui/dialogsmanager.cpp:167
+#: src/gui/popups/popupmenu.cpp:2995
 msgid "Revive"
 msgstr "復活"
 
+#. TRANSLATORS: ok dialog button
+#: src/gui/dialogsmanager.cpp:154
+#, fuzzy
+msgid "GM revive"
+msgstr "復活"
+
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:201
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "您在攜帶超過體重一半的物品.你將無法回復生命值."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:202
+#: src/gui/dialogsmanager.cpp:221
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "您在攜帶少於體重一半的物品.你可以回復生命值了."
 
@@ -1820,7 +1827,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windowmenu.cpp:203 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "裝備"
@@ -1840,7 +1847,7 @@ msgstr "清除裝備"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:152
+#: src/gui/popups/popupmenu.cpp:900 src/gui/windowmenu.cpp:179
 msgid "Spells"
 msgstr "咒語"
 
@@ -2297,7 +2304,7 @@ msgstr "無視"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:93
 msgid "Ignore"
 msgstr "忽略"
 
@@ -2418,7 +2425,7 @@ msgstr "丟棄全部"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:185
 #: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "丟棄"
@@ -2459,7 +2466,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:117
+#: src/gui/popups/popupmenu.cpp:2927 src/gui/windowmenu.cpp:138
 #: src/gui/windows/inventorywindow.cpp:154
 #: src/resources/inventory/inventory.cpp:360
 msgid "Inventory"
@@ -2477,7 +2484,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
+#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:144
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
@@ -2849,7 +2856,7 @@ msgstr "基本"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:147
+#: src/gui/setupinputpages.cpp:50 src/gui/windowmenu.cpp:173
 msgid "Shortcuts"
 msgstr "捷徑"
 
@@ -2858,7 +2865,7 @@ msgstr "捷徑"
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_misc.cpp:420
-#: src/gui/windowmenu.cpp:212 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:250 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "視窗"
 
@@ -2881,7 +2888,7 @@ msgstr "表情"
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:60 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:97 src/gui/windows/chatwindow.cpp:95
+#: src/gui/windowmenu.cpp:115 src/gui/windows/chatwindow.cpp:95
 msgid "Chat"
 msgstr "聊天"
 
@@ -2893,7 +2900,7 @@ msgstr "聊天"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
 #: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
-#: src/gui/widgets/tabs/setup_misc.cpp:500
+#: src/gui/widgets/tabs/setup_misc.cpp:505
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3349,7 +3356,7 @@ msgstr ""
 #. TRANSLATORS: clan chat tab name
 #. TRANSLATORS: long button name for clan window.
 #. TRANSLATORS: clan window name
-#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
+#: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:227
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
 msgstr ""
@@ -4564,7 +4571,7 @@ msgstr ""
 #. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:127
+#: src/gui/widgets/tabs/setup_misc.cpp:169 src/gui/windowmenu.cpp:150
 #: src/gui/windows/debugwindow.cpp:64 src/gui/windows/minimap.cpp:66
 #: src/gui/windows/minimap.cpp:129
 msgid "Map"
@@ -4739,7 +4746,7 @@ msgstr ""
 #. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
+#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:197
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
 #: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
@@ -4816,124 +4823,129 @@ msgstr ""
 msgid "Shortcut buttons"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:430
+msgid "Show icons on shortcut buttons"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:431
+#: src/gui/widgets/tabs/setup_misc.cpp:436
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:436
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:446
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:446
+#: src/gui/widgets/tabs/setup_misc.cpp:451
 msgid "Tunnel through HTTP proxy"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:452
+#: src/gui/widgets/tabs/setup_misc.cpp:457
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:456
+#: src/gui/widgets/tabs/setup_misc.cpp:461
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:462
+#: src/gui/widgets/tabs/setup_misc.cpp:467
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:467
+#: src/gui/widgets/tabs/setup_misc.cpp:472
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:472
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:482
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:487
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:489
+#: src/gui/widgets/tabs/setup_misc.cpp:494
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:495 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:500 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:504
+#: src/gui/widgets/tabs/setup_misc.cpp:509
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:509
+#: src/gui/widgets/tabs/setup_misc.cpp:514
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:514
+#: src/gui/widgets/tabs/setup_misc.cpp:519
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:519
+#: src/gui/widgets/tabs/setup_misc.cpp:524
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:524
+#: src/gui/widgets/tabs/setup_misc.cpp:529
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:530
+#: src/gui/widgets/tabs/setup_misc.cpp:535
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:536
+#: src/gui/widgets/tabs/setup_misc.cpp:541
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:543
+#: src/gui/widgets/tabs/setup_misc.cpp:548
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:550
+#: src/gui/widgets/tabs/setup_misc.cpp:555
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:555
+#: src/gui/widgets/tabs/setup_misc.cpp:560
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:561
+#: src/gui/widgets/tabs/setup_misc.cpp:566
 msgid "Screen density override"
 msgstr ""
 
@@ -4950,7 +4962,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:64
+#: src/gui/windows/confirmdialog.cpp:47
 msgid "No"
 msgstr "否"
 
@@ -5915,231 +5927,231 @@ msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:83
 msgid "ONL"
 msgstr ""
 
 #. TRANSLATORS: long button name for who is online window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:86
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:89
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
+#: src/gui/windowmenu.cpp:92 src/gui/windows/helpwindow.cpp:57
 #: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "說明"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:95
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/questswindow.cpp:65
+#: src/gui/windowmenu.cpp:98 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:101
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:88 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:104 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr ""
 
 #. TRANSLATORS: long button name for emotes window.
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:109
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:112
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:123
 msgid "STA"
 msgstr ""
 
 #. TRANSLATORS: long button name for status window.
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:126
 msgid "Status"
 msgstr "狀態"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:129
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:132 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "裝備"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:135
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:141
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:125
+#: src/gui/windowmenu.cpp:147
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:156
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:135 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:159 src/gui/windows/skilldialog.cpp:85
 msgid "Skills"
 msgstr "技能"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:164
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:142 src/gui/windows/socialwindow.cpp:52
+#: src/gui/windowmenu.cpp:167 src/gui/windows/socialwindow.cpp:52
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:170
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:176
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:155
+#: src/gui/windowmenu.cpp:182
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:188
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: long button name for did you know window.
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:191
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:194
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:200
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:206
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: long button name for updates window.
-#: src/gui/windowmenu.cpp:177
+#: src/gui/windowmenu.cpp:209
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:180
+#: src/gui/windowmenu.cpp:212
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:182 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:215 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:218
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:187 src/gui/windows/mailwindow.cpp:57
+#: src/gui/windowmenu.cpp:221 src/gui/windows/mailwindow.cpp:57
 #: src/resources/inventory/inventory.cpp:381
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for clan window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:224
 msgid "CL"
 msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
-#: src/gui/windowmenu.cpp:195
+#: src/gui/windowmenu.cpp:230
 msgid "SI"
 msgstr ""
 
 #. TRANSLATORS: long button name for server info window.
 #. TRANSLATORS: servers dialog name
-#: src/gui/windowmenu.cpp:197 src/gui/windows/serverinfowindow.cpp:41
+#: src/gui/windowmenu.cpp:233 src/gui/windows/serverinfowindow.cpp:41
 msgid "Server info"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:200
+#: src/gui/windowmenu.cpp:236
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:210
+#: src/gui/windowmenu.cpp:247
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:215
+#: src/gui/windowmenu.cpp:253
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
-#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
+#: src/gui/windowmenu.cpp:256 src/gui/windows/setupwindow.cpp:67
 #: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:428 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
@@ -6527,7 +6539,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "是"