Update translations.

author: Andrei Karas <akaras@inbox.ru> 2016-01-04 16:13:57 +0300
committer: Andrei Karas <akaras@inbox.ru> 2016-01-04 16:24:42 +0300
commit: bd36060150fc429900a9bc1c8631988fc6cd17d4 (patch)
tree: e27fe00dfff56899ca7e1411b506cce24077444c /po
parent: 3256a9ef80e7431e20fe6cd349e31598ba55ee16 (diff)
download: plus-bd36060150fc429900a9bc1c8631988fc6cd17d4.tar.gz
plus-bd36060150fc429900a9bc1c8631988fc6cd17d4.tar.bz2
plus-bd36060150fc429900a9bc1c8631988fc6cd17d4.tar.xz
plus-bd36060150fc429900a9bc1c8631988fc6cd17d4.zip
23 files changed, 16317 insertions, 11612 deletions
diff --git a/po/ca.po b/po/ca.po
index 5ba0207ed..4f7f50937 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
@@ -37,21 +37,21 @@ msgstr "Arxiu enviat"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -67,35 +67,38 @@ msgid "Cache cleaned"
 msgstr "Memòria clau buidada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Temps d'activitat del client: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Imatges de recurs:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Imatges de recurs orfes:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Configuració enviada a:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Configuració de servidor enviada a:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Registre pujat a:"
 
@@ -131,6 +134,7 @@ msgstr "Falta el nom del gremi."
 msgid "Please specify a name."
 msgstr "Si us plau especifica un nom."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Tornar a alternar el xat."
@@ -149,7 +153,8 @@ msgstr "Torna ara a canviar el xat."
 msgid "Message now closes chat."
 msgstr "Missatge ara tanca el xat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -244,7 +249,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -258,8 +264,9 @@ msgstr "Ignorant sol·licituds d'intercanvi"
 msgid "Accepting incoming trade requests"
 msgstr "Acceptant sol·licituds d'intercanvi"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -273,6 +280,7 @@ msgstr "Visible al mapa"
 msgid "Human"
 msgstr "Humà"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "esquiva"
@@ -353,53 +361,53 @@ msgstr[1] "Has recollit %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "treball"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -409,8 +417,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Ignorar completament"
 
@@ -435,9 +443,9 @@ msgid "Floating bubble"
 msgstr "Bombolla flotant"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configuració"
@@ -469,8 +477,9 @@ msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -534,9 +543,12 @@ msgid "Changing game servers"
 msgstr "Canviant servidors de joc"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -547,7 +559,7 @@ msgstr "Canviant servidors de joc"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -740,32 +752,37 @@ msgstr ""
 msgid "Error creating updates directory!"
 msgstr "Error creant el directori d'actualitzacions!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s no existeix i no pot ser creat! Sortint."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
@@ -1195,7 +1212,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr ""
 
@@ -1214,10 +1231,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "Per defecte"
 
@@ -1378,8 +1396,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1710,14 +1728,14 @@ msgstr "Crear grup"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1769,13 +1787,17 @@ msgstr "Intercanvi"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1837,8 +1859,9 @@ msgstr "Moure"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Parlar"
 
@@ -1851,11 +1874,12 @@ msgstr "Parlar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1868,11 +1892,12 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vendre"
 
@@ -1881,7 +1906,7 @@ msgstr "Vendre"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr ""
 
@@ -1907,7 +1932,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1962,9 +1987,10 @@ msgstr "Des-equipar"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr ""
 
@@ -1990,8 +2016,8 @@ msgstr "Jugadors"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr ""
 
@@ -2003,8 +2029,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Afegir al xat"
 
@@ -2019,8 +2045,8 @@ msgstr "Element del mapa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr ""
 
@@ -2028,7 +2054,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
@@ -2040,11 +2066,11 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Conjunt"
@@ -2056,8 +2082,8 @@ msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Conjurs"
 
@@ -2123,8 +2149,8 @@ msgstr "Deixa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2150,43 +2176,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Canviar el nom de la marca de mapa "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Nom:                     "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Afegeix al intercanvi"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Agregar-ne 10 al intercanvi"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Agregar-ne la mitat al intercanvi"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Agregar-los tots al intercanvi"
 
@@ -2195,50 +2235,66 @@ msgstr "Agregar-los tots al intercanvi"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Botiga"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Emmagatzema 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Emmagatzema la mitat"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Emmagatzema-ho tot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Recupera 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Recuperar la mitat"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Recupera-ho tot"
 
@@ -2246,58 +2302,59 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Utilitzar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Amagar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr ""
 
@@ -2305,30 +2362,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr ""
 
@@ -2336,7 +2393,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2345,202 +2402,206 @@ msgstr "Nivell: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Deixar caure..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Deixar caure"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2551,17 +2612,17 @@ msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Dreceres"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2575,9 +2636,10 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Xat"
 
@@ -2589,9 +2651,9 @@ msgstr "Xat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2678,10 +2740,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
@@ -2864,14 +2928,17 @@ msgstr ""
 msgid "Road point"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2966,7 +3033,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivell: %d"
@@ -2985,7 +3052,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3019,12 +3086,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3535,7 +3604,8 @@ msgstr ""
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3543,11 +3613,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3558,28 +3629,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Colors"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Treure colors dels missatges de xat rebuts"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Mostra llista de colors del xat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3589,31 +3662,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Permet màgia i comandaments de GM en totes les pestanyes de xat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Limitar màxim de caràcters en línia de xat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3623,11 +3698,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Limitar màxim de lines de xat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3637,16 +3713,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Permet registre de xat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3654,31 +3731,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Mostra historial de xat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3688,11 +3768,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3702,16 +3783,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Amaga missatges de botiga"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3723,11 +3805,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3738,17 +3821,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Col·loca tots els xiuxiueigs en pestanyes"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3759,11 +3843,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Registra els missatges de màgia en la pestanya del depurador"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3772,11 +3857,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Mostra els missatges del servidor en la finestra del depurador"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3786,11 +3872,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Permet finestra d'intercanvi"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3799,11 +3886,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3813,11 +3901,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3826,11 +3915,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3840,11 +3930,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Permet pestanya de batalla"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3854,11 +3945,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Mostra esdeveniments de batalla"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3866,11 +3958,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3881,27 +3974,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3910,11 +4005,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3923,11 +4019,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3938,16 +4035,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Així es com es veu el color"
@@ -3959,7 +4058,7 @@ msgstr "Tipus:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Retard:"
 
@@ -3980,33 +4079,33 @@ msgstr "Blau:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Estàtic"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Pols"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Arc de Sant Martí"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Espectre"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -4215,9 +4314,10 @@ msgid "Cycle monster targets"
 msgstr "Encercla objectiu del monstre"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4328,238 +4428,240 @@ msgstr ""
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Mostra barra de vida pròpia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Habilita estadístiques ràpides"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Encercla objectiu del jugador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Mostra missatges d'experiència de treball"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Mostra finestres emergents de jugadors"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Mostra treball"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Botiga"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Acceptar peticions de compra/venda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Permet mode botiga"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Registra els diàlegs de NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Habilitar atac del cantó del servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Permet comprovador de bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Permet registre de depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Mode de baix tràfic"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Mostra fons"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4826,13 +4928,14 @@ msgstr "Permet intercanvis"
 msgid "Allow whispers"
 msgstr "Permet xiuxiueigs"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4840,12 +4943,12 @@ msgid "Delete"
 msgstr "Esborra"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Quan ignoris:"
 
@@ -4915,30 +5018,31 @@ msgstr ""
 msgid "i"
 msgstr ""
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Tema canviat"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el client per que els canvis tinguin efecte."
 
@@ -5031,8 +5135,8 @@ msgstr "Límit d'FPS:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Límit d'FPS alternatiu: "
 
@@ -5062,16 +5166,18 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Res"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5079,7 +5185,7 @@ msgstr ""
 "fallat!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5087,42 +5193,43 @@ msgstr ""
 "també ha fallat!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Canviant a pantalla completa"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Reinici requerit per que els canvis tinguin efecte."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Canviant a OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar un canvi a OpenGL requereix reinici."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolució personalitzada (exemple: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Entra nova resolució:                "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "La resolució de la pantalla ha canviat"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa."
@@ -5240,48 +5347,50 @@ msgstr "Efectes d'ambient"
 msgid "max"
 msgstr "màxim"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Detall de partícules"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5326,6 +5435,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr "Ha invitat a l'usuari %s al gremi %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5371,11 +5481,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Ha invitat al usuari %s al grup."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5430,208 +5542,218 @@ msgstr ""
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Qui està en línia"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "KS"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Estadística de morts"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "EST"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Estat"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EQU"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Equipament"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventari"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Motxilla"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "HAB"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Habilitats"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "CON"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Clau: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5661,7 +5783,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crear"
 
@@ -5892,7 +6014,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Juga"
@@ -5908,23 +6030,23 @@ msgid "Info"
 msgstr "Informació"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5934,27 +6056,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr ""
 
@@ -5976,7 +6099,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6139,12 +6263,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6377,8 +6501,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6413,7 +6538,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6437,6 +6563,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Barra de vida"
@@ -6476,6 +6603,7 @@ msgstr "Barra de fletxes"
 msgid "status bar"
 msgstr "Barra d'estatus"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "Barra de treball"
@@ -6684,13 +6812,14 @@ msgid "Reset Windows"
 msgstr "Restaurar finestres"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Botiga personal"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6709,23 +6838,46 @@ msgstr "Mostra enllaços al anunci"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s vol %s %s acceptes?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s vol %s %s acceptes?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Petició d'intercanvi"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s vol %s %s acceptes?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6736,36 +6888,37 @@ msgid "Up"
 msgstr "Aumentar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punts d'habilitat restants: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilitats %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Habilitat %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6869,21 +7022,23 @@ msgstr "%s t'ha invitat a unir-te al seu grup."
 msgid "%s has invited you to join the %s party."
 msgstr "%s t'ha invitat a unir-te al grup %s."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Acceptar invitació a grup"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "No es pot crear grup. Ja en pertanys a un."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Nom del grup"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Tria el nom del teu grup."
 
@@ -7060,27 +7215,28 @@ msgstr "Actualitzant..."
 msgid "Connecting..."
 msgstr "Connectant..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 El procés d'actualització està incomplet."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Això es altament recomanat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1 tornes a provar més tard."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Complet"
 
@@ -8532,284 +8688,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Has estat desconnectat del servidor!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Força"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Agilitat"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitalitat"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Intel·ligència"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Destresa"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Sort"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Defensa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "Atac màgic"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "Defensa màgica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% de Precisió"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% de Evasió"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% de Crític"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Retard d'atac"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Demora a peu"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Distància d'atac"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Autenticació fallida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "No hi ha cap servidor disponible."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Algú altre està provant d'utilitzar aquest compte."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Aquest compte ja està sent utilitzat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Hack de desplaçament ràpid detectat."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Accès de sessió duplicat."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Error de connexió desconegut."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8842,103 +9033,116 @@ msgstr "Antiga contrasenya incorrecta."
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Nivell de treball: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9646,7 +9850,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10192,12 +10396,12 @@ msgid "%d minutes"
 msgstr "%d minuts"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "Segon  %d"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d segons"
diff --git a/po/cs.po b/po/cs.po
index fd5c7c995..20d1e7c2b 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2016-01-03 16:55+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
@@ -42,21 +42,21 @@ msgstr "Soubor byl uploadován"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -72,35 +72,38 @@ msgid "Cache cleaned"
 msgstr "Vyrovnávací paměť vyčištěna"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Resource images:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Resource orphaned images:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Systémové proměnné uloženy"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Nahráno nastavení do:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Nahráno nastavení serveru do:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Nahrány záznmy do:"
 
@@ -135,6 +138,7 @@ msgstr "Chybí jméno gildy."
 msgid "Please specify a name."
 msgstr "Prosím zadej jméno."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Enter přepíná chat."
@@ -153,7 +157,8 @@ msgstr "Enter nyní přepíná chat."
 msgid "Message now closes chat."
 msgstr "Zpráva nyní ukončuje chat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -248,7 +253,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -262,8 +268,9 @@ msgstr "Ignorovat příchozí žádosti o obchodování"
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -277,6 +284,7 @@ msgstr "Viditelný na mapě"
 msgid "Human"
 msgstr "Člověk"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "uskočení"
@@ -358,53 +366,53 @@ msgstr[2] "Sebral jsi %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "zk"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "práce"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Nasledovat: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitace: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Vidíš %s"
@@ -414,8 +422,8 @@ msgstr "Vidíš %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -440,9 +448,9 @@ msgid "Floating bubble"
 msgstr "Plovoucí bublina"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Nastavení"
@@ -474,8 +482,9 @@ msgid "About"
 msgstr "O ManaPlus"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápověda"
@@ -539,9 +548,12 @@ msgid "Changing game servers"
 msgstr "Vyměňuji herní servery"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -552,7 +564,7 @@ msgstr "Vyměňuji herní servery"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -746,32 +758,37 @@ msgstr "Neplatný host pro update: %s."
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "nebo"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Obecný"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1201,7 +1218,7 @@ msgstr "Zpráva"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Oživ"
 
@@ -1221,10 +1238,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "výchozí"
 
@@ -1385,8 +1403,8 @@ msgstr "Maximální (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(výchozí)"
 
@@ -1717,14 +1735,14 @@ msgstr "Vytvořit partu"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1776,13 +1794,17 @@ msgstr "Obchod"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Útok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1844,8 +1866,9 @@ msgstr "Jdi sem"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Promluv"
 
@@ -1858,11 +1881,12 @@ msgstr "Promluv"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Nákup"
 
@@ -1875,11 +1899,12 @@ msgstr "Nákup"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Prodej"
 
@@ -1888,7 +1913,7 @@ msgstr "Prodej"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Přidat komentář"
 
@@ -1914,7 +1939,7 @@ msgstr "Přidat do seznamu útoku"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
@@ -1969,9 +1994,10 @@ msgstr "Odebrat z vybavení"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -1997,8 +2023,8 @@ msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
@@ -2010,8 +2036,8 @@ msgstr "Sebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Přidat do chatu"
 
@@ -2026,8 +2052,8 @@ msgstr "Označit na mapě"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Odebrat"
 
@@ -2035,7 +2061,7 @@ msgstr "Odebrat"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Přesun"
 
@@ -2047,11 +2073,11 @@ msgstr "Přesunout kameru"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Výstroje"
@@ -2063,8 +2089,8 @@ msgid "Clear outfit"
 msgstr "Vyčistit výstroj"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Kouzla"
 
@@ -2130,8 +2156,8 @@ msgstr "Opustit"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Kopírovat do schránky"
 
@@ -2157,43 +2183,57 @@ msgstr "Odemknout"
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Přejmenovat značku na mapě "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Jméno:                   "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Hráčův komentář           "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Komentář:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Přidat k obchodu"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Přidat 10 k obchodu"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Přidat polovinu k obchodu"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Vlož do obchodu vše-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Přidat vše k obchodu"
 
@@ -2202,50 +2242,66 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Uložit"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Uschovat 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Ulož vše-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Uschovat všechny"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Vzít"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Vzít polovinu"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Vyber vše-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
@@ -2253,58 +2309,59 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Vyčistit okno upuštění"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2312,30 +2369,30 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Otevřít odkaz"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Zobrazit okno"
 
@@ -2343,7 +2400,7 @@ msgstr "Zobrazit okno"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2352,202 +2409,206 @@ msgstr "Úroveň: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Přehlížet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr "Připojit k chatu %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Přidej do seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Přestat chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Upustit vše"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "Zkontrolovat ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Jdi na"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Vykopnout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2558,17 +2619,17 @@ msgid "Basic"
 msgstr "Zkladní"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Zkratky"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Okna"
 
@@ -2582,9 +2643,10 @@ msgstr "Smajlíci"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
@@ -2596,9 +2658,9 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2685,10 +2747,12 @@ msgstr "Človíček"
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Členové party"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Členové gildy"
@@ -2871,14 +2935,17 @@ msgstr "Okraj domácího místa"
 msgid "Road point"
 msgstr "Bod na cestě"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Úroveň: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2973,7 +3040,7 @@ msgstr "Upravit"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Úroveň: %d"
@@ -2992,7 +3059,7 @@ msgstr "Typ: %s"
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr "Neznámý"
 
@@ -3026,12 +3093,14 @@ msgstr "Zamcílí past"
 msgid "Unknown:"
 msgstr "Neznámý:"
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr "Dosah: %d"
@@ -3542,7 +3611,8 @@ msgstr "Okno"
 msgid "Auto hide chat window"
 msgstr "Automaticky schovávat okno chatu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3550,11 +3620,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr "Chránít zaměření chatu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3565,28 +3636,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Barvy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Odstranit barvy z příchozích chatových zpráv"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Zobrazit seznam barev"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3596,31 +3669,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Příkazy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Povolit magii a GM příkazy ve všech záložkách"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Omezení"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Omezit maximum znaků na řádek"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3630,11 +3705,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Omezit počet řádků chatu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3644,16 +3720,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Záznamy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Zapnout zaznamenávání konverzace"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3661,31 +3738,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Povolit debugový chat?"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Zobrazovat historii chatu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr "Zobrazit zprávy o připojení party"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3695,11 +3775,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Zobrazit zprávy o připojení gildy"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3709,16 +3790,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Zprávy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Skrýt obchodní zprávy"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3730,11 +3812,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Zobrazit MVP zprávy"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3745,17 +3828,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Záložky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Všecha šeptání jako záložky"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3766,11 +3850,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Zaznamenávat zprávy o magii v debug záložce"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3779,11 +3864,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Zobrazovat serverové zprávy v debug záložce"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3793,11 +3879,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Zapnout obchodní záložku"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3806,11 +3893,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Povolit GM záložku"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3820,11 +3908,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Povolit záložku jazyka"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3833,11 +3922,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Zobrazit zprávy všech jazyků"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3847,11 +3937,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Zapnout bitevní záložku"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3861,11 +3952,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Zobrazovat bitevní události"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3873,11 +3965,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Změnit velikost záložek pokud nutno"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3888,27 +3981,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Čas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Použít místní čas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Zvýrazňovaná slova (oddělená čárkou)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3917,11 +4012,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr "Globálně ignorovaná jména (oddělená čárkou)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3930,11 +4026,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr "Zobrazit knoflík pro smajlíky v chatu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3945,16 +4042,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr "Zobrazit motto dne od serveru při startu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Takhle bude barva vypadat"
@@ -3966,7 +4065,7 @@ msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Prodleva:"
 
@@ -3987,33 +4086,33 @@ msgstr "Modrá:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Statický"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Pulzní"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Duhový"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Průhlednost:"
 
@@ -4222,9 +4321,10 @@ msgid "Cycle monster targets"
 msgstr "Cyklovat zaměřená monstra"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4335,238 +4435,240 @@ msgstr "Pohyby relativní k myši (dobré pro dotyková rozhraní)"
 msgid "Player"
 msgstr "Hráč"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Zobrazit vlastní pruh životů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Zapnout rychlé statistiky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Cyklovat zaměřené hráče"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Zobrazovat zprávy o pracovních zkušenostech"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Zobrazovat bubliny hráčů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Away zpráva"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Zobrazit práci"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Povolit filtr útoku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Zapni filtr sběru"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Povolit upozorňovací protokol"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr "Povolit podporu mazlíčků"
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Povolit upozornění na váhu"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Obchod"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Akceptovat požadavky na koupi/prodej"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Zapnout mód obchodu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "Přepínej NPC cíle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Zaznamenávat dialogy s NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Podpora botů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Zapnout podporu guild bota a vypnout nativní podporu gild"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Klávesnice"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Zpoždění opakování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Interval opakování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Vlastní interval opakování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "Knoflíky zkratek"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Proxy server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Typ proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Proxy adresa:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Povolit útok na straně serveru"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr "Skrýt stránku podpory při chybě"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr "Povolit dvojklik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Zapnout ověřovač botů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 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_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Zapnout debug záznam"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr "Ignorovat pakety záznamu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Zapni OpenGL log"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Povolit záznam vstupu"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Uploadovat soubor se záznamem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Mód nízkého síťového provozu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 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_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr "Složka pro snímky obrazovky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Zpoždění sítě mezi sub servery"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Zobrazit pozadí"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Vlastní nastavení hustoty obrazovky"
 
@@ -4840,13 +4942,14 @@ msgstr "Povolit obchodování"
 msgid "Allow whispers"
 msgstr "Povolit šeptání"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4854,12 +4957,12 @@ msgid "Delete"
 msgstr "Smazat"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Vztahy"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Když ignoruji:"
 
@@ -4929,30 +5032,31 @@ msgstr "Velikost fontu NPC"
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Jméno: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "Copyright:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Informace o motivu"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Téma změněno"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Restartujte klient pro aplikováni změn."
 
@@ -5045,8 +5149,8 @@ msgstr "Omezení FPS:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Altern. FPS omezení: "
 
@@ -5076,23 +5180,25 @@ msgid "No frame"
 msgstr "Žádný rámeček"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Žádné"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5100,42 +5206,43 @@ msgstr ""
 "selhalo!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Přepínám na celou obrazovku"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Pro uplatnění změn je potřeba restart."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Měním na OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Změny v OpenGL vyžadují restart."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Vlastní rozlišení (příklad: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Zadej nové rozlišení:                "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Rozlišení obrazovky změněno"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Některá okna mohou být přesunuta aby se vešla do menšího okna."
 
@@ -5252,48 +5359,50 @@ msgstr "Efekty prostředí"
 msgid "max"
 msgstr "maximální"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Detaily částic"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Fyzika částic"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Gama"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Povolit nastavení Gama"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Centruj okno hry"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Povol spuštění spořiče obrazovky"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr "Snímky obrazovky"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr "Přidat ke snímkům obrazovky vodotisk"
 
@@ -5338,6 +5447,7 @@ msgstr "Hráči: %u/%u"
 msgid "Invited user %s to guild %s."
 msgstr "Pozvali jste %s do gildy %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5383,11 +5493,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr "Portály: %u/%u"
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Hráč %s pozván do party."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5442,208 +5554,218 @@ msgstr "Viditelní hráči: %d"
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Kdo je online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "POM"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "ÚK"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Úkoly"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "SZ"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Statistiky zabíjení"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Smajlíci"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Stav"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "VYB"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Vybavení"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventář"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Košík"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "DOV"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Dovednosti"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Společenství"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "ZK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "KO"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "UP"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "VŽ"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Víte že"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "OBCH"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "VÝ"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr "AK"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr "Aktualizace"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr "BA"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banka"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "OKN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "NAS"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Klávesa: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Peníze v bance: %s"
@@ -5673,7 +5795,7 @@ msgstr "Počet:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -5904,7 +6026,7 @@ msgstr "Heslo"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Hrát"
@@ -5920,23 +6042,23 @@ msgid "Info"
 msgstr "Informace"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Účet %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr "Prosím nastavte nový pin kód"
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr "Prosím zadejte nové jméno"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5951,27 +6073,28 @@ msgstr ""
 "Zkušenost: %u\n"
 "Peníze: %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Špatné heslo"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Zadej heslo pro smazání postavy"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
@@ -5993,7 +6116,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "mazlíček patřící %s"
@@ -6156,12 +6280,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6396,8 +6520,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6432,7 +6557,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6456,6 +6582,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "pruh zdraví"
@@ -6495,6 +6622,7 @@ msgstr "pruh šípů"
 msgid "status bar"
 msgstr "stavový řádek"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "pruh práce"
@@ -6703,13 +6831,14 @@ msgid "Reset Windows"
 msgstr "Resetovat okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Osobní obchod"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6728,23 +6857,46 @@ msgstr "Zobrazit odkazy v oznámení"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s chce %s %s příjímáte?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s chce %s %s příjímáte?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Požadavek k obchodování"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s chce %s %s příjímáte?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6755,36 +6907,37 @@ msgid "Up"
 msgstr "Zvýšit"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dovednostních bodů: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Dovednost nastavena %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Dovednost %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Neúspěšná dovednost: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6888,21 +7041,23 @@ msgstr "%s vás pozval ke vstupu do jeho party."
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Jméno party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
@@ -7077,27 +7232,28 @@ msgstr "Aktualizuje se..."
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr "Zobrazit všecky novinky (může být pomalé)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces aktualizace není kompletní."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1  silně doporučujeme zkusit"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  aktualizaci později."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Hotovo"
 
@@ -8555,284 +8711,319 @@ msgstr "Postava nenalezena."
 msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr "Na tomto místě není možné použít dovednost."
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr "Na tomto místě není požné použít předmět."
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr "Není možné obléct. Špatná úroveň."
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr "Nené možné použít. Špatná úroveň."
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr "Na tomhle se pracuje."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Zpráva nemohla být poslána. Kanál %s neexistuje."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Není možné otevřít kanál %s. Kanál neexistuje."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr "Síla %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr "Hbitost %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalita %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr "Obratnost %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr "Štěstí %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Byl jsem odpojen od server!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Síla"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Hbitost"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitalita"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Inteligence"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Obratnost"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Štěstí"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Obrana"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "Magický útok"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "Magická Obr."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Přesnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Uhnutí"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Kritický zásah"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Zpoždění útoku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Zpoždění chůze"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Dosah útoku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Poškození za vteř."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Ověření selhalo."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Nejsou dostupné žádné servery."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Někdo jiný se pokouší používat tento účet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Tento účet je již přihlášen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Detekován podvod s rychlostí."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr "Server je plný."
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr "Promiň jsi moc mladý."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Duplicitní přihlášení."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr "Moc spojení z jedné IP adresy."
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr "Není neplaceno."
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr "Placení pozastaveno."
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr "Placení zeměněno."
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr "Zaplatit špatnou IP adresu."
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr "Zaplatit herní místnost."
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr "Odpojení vynuceno GM."
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Neznámá chyba připojení."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8865,103 +9056,116 @@ msgstr "Půvoní heslo je nesprávné."
 msgid "New password too short."
 msgstr "Nové heslo je příliš krátké."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Úroveň gildy: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nedosáhl jste ještě dostatečně vysoké úrovně!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Nedostatek životů (HP)!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Nedostatek bodů dovednosti (SP)!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Nemáte žádné zprávy!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Toto momentálně nemůžete udělat!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Vypadá to že potřebujete více peněz... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nemůžete použít tuto dovednost s touto zbraní!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Potřebujete další rubín!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Potřebujete další safír!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Neseš příliš mnoho na to abys mohl udělat toto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9669,7 +9873,8 @@ msgstr "Pokus o polapení mazíčka selhal."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+#, fuzzy
+msgid "Pet caught."
 msgstr "Mazlíček byl polapen."
 
 #. TRANSLATORS: notification message
@@ -10214,12 +10419,12 @@ msgid "%d minutes"
 msgstr "%d minut"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d vteřinu"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
diff --git a/po/de.po b/po/de.po
index 1945c14c1..a2bf8f48b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2016-01-03 16:54+0000\n"
 "Last-Translator: Valsu <valsu@hylia.de>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
@@ -62,21 +62,21 @@ msgstr "Datei hochgeladen"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -92,35 +92,38 @@ msgid "Cache cleaned"
 msgstr "Zwischenspeicher geleert"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Umgebungsvariablen ausgegeben"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Konfiguration hochgeladen zu:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Serverconfig hochgeladen zu:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Log hoch geladen zu:"
 
@@ -157,6 +160,7 @@ msgstr "Name der Gilde fehlt."
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Enter schaltet Chat um."
@@ -175,7 +179,8 @@ msgstr "Enter schaltet nun den Chat um."
 msgid "Message now closes chat."
 msgstr "Nachricht schließt nun den Chat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr "Hut %s angezogen."
@@ -270,7 +275,8 @@ msgstr "Konfigurationswert: %s"
 msgid "Server config value: %s"
 msgstr "Konfigurationswert des Servers: %s"
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr "Dein Haustier umbennen"
 
@@ -284,8 +290,9 @@ msgstr "Eingehende Handelsanfragen ignorieren"
 msgid "Accepting incoming trade requests"
 msgstr "Eingehende Handelsanfragen akzeptieren"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr "Schnell"
 
@@ -299,6 +306,7 @@ msgstr "Auf der Karte sichtbar"
 msgid "Human"
 msgstr "Mensch"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "ausweichen"
@@ -379,53 +387,53 @@ msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "EP"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr "mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Folgen: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Du siehst %s"
@@ -435,8 +443,8 @@ msgstr "Du siehst %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Komplett ignorieren"
 
@@ -461,9 +469,9 @@ msgid "Floating bubble"
 msgstr "Schwebende Blase"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Einstellungen"
@@ -495,8 +503,9 @@ msgid "About"
 msgstr "Über"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hilfe"
@@ -560,9 +569,12 @@ msgid "Changing game servers"
 msgstr "Spielserver wechseln"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -573,7 +585,7 @@ msgstr "Spielserver wechseln"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -771,32 +783,37 @@ msgstr "Ungültiger Updateserver: %s."
 msgid "Error creating updates directory!"
 msgstr "Fehler beim erstellen des Verzeichnisses für Updates!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fehler: %s existiert nicht und kann nicht erstellt werden! Beende..."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "oder"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1226,7 +1243,7 @@ msgstr "Nachricht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Wiederbeleben"
 
@@ -1249,10 +1266,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "Standard"
 
@@ -1413,8 +1431,8 @@ msgstr "Riesig (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(Normal)"
 
@@ -1745,14 +1763,14 @@ msgstr "Gruppe erstellen"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1804,13 +1822,17 @@ msgstr "Handeln"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Angriff"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1872,8 +1894,9 @@ msgstr "Bewegen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Sprechen"
 
@@ -1886,11 +1909,12 @@ msgstr "Sprechen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -1903,11 +1927,12 @@ msgstr "Kaufen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Verkaufen"
 
@@ -1916,7 +1941,7 @@ msgstr "Verkaufen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
@@ -1942,7 +1967,7 @@ msgstr "Zur Angriffsliste hinzufügen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Zur Ignorierenliste hinzufügen"
 
@@ -1997,9 +2022,10 @@ msgstr "Ablegen"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -2025,8 +2051,8 @@ msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
@@ -2038,8 +2064,8 @@ msgstr "Aufheben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
@@ -2054,8 +2080,8 @@ msgstr "Kartengegenstand"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -2063,7 +2089,7 @@ msgstr "Entfernen"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Teleport"
 
@@ -2075,11 +2101,11 @@ msgstr "Kamera bewegen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Ausrüstungset"
@@ -2091,8 +2117,8 @@ msgid "Clear outfit"
 msgstr "Ausrüstungset leeren"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Zaubersprüche"
 
@@ -2158,8 +2184,8 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
@@ -2185,43 +2211,57 @@ msgstr "Entsperren"
 msgid "Lock"
 msgstr "Sperren"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Name:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Spieler Kommentar         "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Kommentar:                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Zum Handeln hinzufügen"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "10 zum Handeln hinzufügen"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Die Hälfte zum Handeln hinzufügen"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Alles -1 zum Handel hinzufügen"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Alles zum Handeln hinzufügen"
 
@@ -2230,50 +2270,66 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Aufbewahren"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Hälfte aufbewahren"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Alles -1 ablegen"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Hälfte abholen"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Alles -1 aufnehmen"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
@@ -2281,58 +2337,59 @@ msgstr "Alles abholen"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Fenster: Wegwerfen leeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Verstecke"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Zeige"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr "Einstellungen des gelben Balkens öffnen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Gelben Balken zurücksetzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Zu Chat kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
@@ -2340,30 +2397,30 @@ msgstr "Nach unten bewegen"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
@@ -2371,7 +2428,7 @@ msgstr "Fenster anzeigen"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2380,202 +2437,206 @@ msgstr "Stufe: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr "Max Level"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr "Imitieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Kaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Verkaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Zu Gruppe einladen"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr "Chat beitreten %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Gegenstände anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Gegenstand nicht mehr schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Gegenstand schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Alles wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "GM...."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "GM Befehle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "IP überprüfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Gehe zu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Zurückrufen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Rauswerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr "Stummschalten %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr "Laut schalten %d"
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr "Level: %d / %d"
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr "Level: Unbekannt"
@@ -2586,17 +2647,17 @@ msgid "Basic"
 msgstr "Normal"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Kurzbefehle"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fenster"
 
@@ -2610,9 +2671,10 @@ msgstr "Gefühle"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
@@ -2624,9 +2686,9 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2713,10 +2775,12 @@ msgstr "Humunkulus"
 msgid "Skill unit"
 msgstr "Fähigkeitseinheit"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Gruppenmitglieder"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Gildenmitglieder"
@@ -2899,14 +2963,17 @@ msgstr "Stammplatzrahmen"
 msgid "Road point"
 msgstr "Wegpunkt"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Level: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -3001,7 +3068,7 @@ msgstr "Ändern"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3020,7 +3087,7 @@ msgstr "Typ: %s"
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -3054,12 +3121,14 @@ msgstr "Falle anvisieren"
 msgid "Unknown:"
 msgstr "Unbekannt:"
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr "Reichweite: %d"
@@ -3570,7 +3639,8 @@ msgstr "Fenster"
 msgid "Auto hide chat window"
 msgstr "Fenster: Chat automatisch verstecken"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3582,11 +3652,12 @@ msgstr ""
 "machen."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr "Chatfokus schützen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3601,17 +3672,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Farben"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Farben von eingehenden Chatnachrichten entfernen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
@@ -3621,11 +3693,12 @@ msgstr ""
 "dies aktiviert ist."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Chatfarben-Liste anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3641,16 +3714,17 @@ msgstr ""
 "Nachrichten, aber belegt auch etwas Platz im Chatfenster."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Befehle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Magie- und GM-Befehle in jedem Chatreiter erlauben"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
@@ -3658,16 +3732,17 @@ msgstr ""
 "Reiter ausführen zu können."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Begrenzungen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Maximale Zeichen in Chatzeile begrenzen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3682,11 +3757,12 @@ msgstr ""
 "länger als die Begrenzung sind werden abgeschnitten."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Maximale Zeilen im Chat begrenzen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3699,16 +3775,17 @@ msgstr ""
 "Begrenzung überschreiten, werden aus dem Rückholspeicher verworfen."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Logs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Chatlog aktivieren"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3721,22 +3798,24 @@ msgstr ""
 "Festplattenspeicher einnehmen."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Debug-Chatlog aktivieren"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 "Wenn du dies aktivierst, wird der Debug Chatreiter ebenfalls auf der "
 "Festplatte geloggt."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Chatverlauf anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
@@ -3745,11 +3824,12 @@ msgstr ""
 "laden anstatt das leere Chatreiter angezeigt werden."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr "Gruppennachrichten über Anwesenheit anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3764,11 +3844,12 @@ msgstr ""
 "deine Freunde online kommen."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Gildennachrichten über Anwesenheit anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3783,16 +3864,17 @@ msgstr ""
 "deine Freunde online kommen."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Nachrichten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Mitteilungen über Laden verstecken"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3812,11 +3894,12 @@ msgstr ""
 "wenn andere Spieler deinen Laden ansehen."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "MVP-Mitteilungen anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3831,17 +3914,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Reiter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Alle Flüsternachrichten in Reitern anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3860,11 +3944,12 @@ msgstr ""
 "zweimal ob du diese Funktion deaktivierst."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Magische Nachrichten im Debugreiter aufzeichnen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3879,11 +3964,12 @@ msgstr ""
 "Zaubersprüche antwortet."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Servermitteilungen im Debugreiter anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3900,11 +3986,12 @@ msgstr ""
 "könntest,  da es sich um gefälschte Servernachrichten handelt."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Handelsreiter aktivieren"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3918,11 +4005,12 @@ msgstr ""
 "Reiter."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "GM-Reiter einschalten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3937,11 +4025,12 @@ msgstr ""
 "seit dieser Reiter nur für GMs angezeigt wird."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Sprachenreiter einschalten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3952,11 +4041,12 @@ msgstr ""
 "der Server dieses Merkmal unterstützt."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Alle Sprachnachrichten anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3972,11 +4062,12 @@ msgstr ""
 "unterstüzen."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Kampfreiter aktivieren"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3991,11 +4082,12 @@ msgstr ""
 "Hinweis: Klient muss neu gestartet werden um diese Funktion zu aktivieren."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Kampfereignisse anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -4006,11 +4098,12 @@ msgstr ""
 "angezeigt. Falls deaktiviert werden keine Nachrichten zum Kampf angezeigt."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Falls nötig Chatreiter Größe ändern"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -4028,16 +4121,17 @@ msgstr ""
 "nutzbaren Platz für Text."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Zeit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Lokale Zeit benutzen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
@@ -4046,11 +4140,12 @@ msgstr ""
 "Zeit. Wenn deaktiviert, wird die Serverzeit benutzt (oftmals ist das GMT+0)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Wörter hervorheben (Mit Komma trennen)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4063,11 +4158,12 @@ msgstr ""
 "Hinweis: Häufige Hervorhebungen sind lästig - benutze sie mit Bedacht."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr "Globale Nachrichten von Name ignorieren (Mit Komma trennen)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4082,11 +4178,12 @@ msgstr ""
 "wichtige Ankündigungen verpasst!"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr "Emotes im Chat anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4104,11 +4201,12 @@ msgstr ""
 "schreibst, aufgerufen werden."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr "NdT Servernachricht beim Start anzeigen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4117,6 +4215,7 @@ msgstr ""
 "(Nachricht des Tages) anzeigen, sobald du auf dem Server bist. Deaktiveren, "
 "um die NdT nicht anzuzeigen."
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "So sieht die Farbe aus"
@@ -4128,7 +4227,7 @@ msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Verzug:"
 
@@ -4149,33 +4248,33 @@ msgstr "Blau:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Statisch"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Pulsierend"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Regenbogen"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -4384,9 +4483,10 @@ msgid "Cycle monster targets"
 msgstr "Zwischen anvisierten Monstern wechseln"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4497,240 +4597,242 @@ msgstr "Mausabhängige Bewegungen (Gut für Touchpads)"
 msgid "Player"
 msgstr "Spieler"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Eigenen HP-Balken anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Schnelles Aufwerten der Spielerattribute aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Angriffsziele des Spielers einkreisen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Job-EP Nachrichten anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Popups von Spielern anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Abwesenheitsnachricht"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Job zeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Angriffsfilter aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Aufhebefilter aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Reklamenprotokoll aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr "Unterstützung für Haustiere aktivieren"
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Benachrichtigungen über Gewicht aktivieren"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Laden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Verkauf- und Kaufanfragen akzeptieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Laden-Modus einschalten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "Zwischen anvisierten NPCs wechseln"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "NPC Dialoge aufzeichnen"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Unterstützung für Bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Botunterstützung von Gilden aktivieren und serverseitige Gildenunterstüzung "
 "deaktiveren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr "Aktiviere Bot-Unterstützung für den Mana-Markt"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Tastatur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Wiederholungsverzug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Wiederholungszeitraum"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Benutzerdefinierter Wiederholungsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "Kurzbefehlknöpfe"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Proxy Server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Proxy Typ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Proxy addresse:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Serverseitigen Angriff aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr "Bei Fehlermeldungen Link zur Unterstützungsseite verstecken"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr "Doppelklick aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Botprüfer einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Schutz bei fehlerhaften-Servern aktiveren (Nicht deaktivieren)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Debuglog aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr "Aufzeichnung der Pakete ignorieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr "Unimplementierte Pakete loggen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "OpenGL-Log aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Eingabelog aktivieren"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Log-Datei hochladen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Niedriger Datenverkehrsmodus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 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_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr "Screenshotverzeichnis"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Netzwerkverzug zwischen Unterservern"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Hintergrund anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Bildschirmraster überschreiben"
 
@@ -5004,13 +5106,14 @@ msgstr "Handeln erlauben"
 msgid "Allow whispers"
 msgstr "Flüstern erlauben"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -5018,12 +5121,12 @@ msgid "Delete"
 msgstr "Löschen"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Beziehungen"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
@@ -5093,30 +5196,31 @@ msgstr "NPC-Schriftgröße"
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Name: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "Copyright:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Theme Info"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Theme geändert"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu, um die Änderungen zu übernehmen."
 
@@ -5209,8 +5313,8 @@ msgstr "FPS Grenze:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Alternative FPS Grenze: "
 
@@ -5240,16 +5344,18 @@ msgid "No frame"
 msgstr "Kein Fensterrahmen"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Kein(e)"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5257,7 +5363,7 @@ msgstr ""
 "Auflösung schlug fehl!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5265,44 +5371,45 @@ msgstr ""
 "Auflösung schlug fehl!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Wechsle zu OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Benutzerdefinierte Auflösung (zum Beispiel: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Neue Auflösung eingeben:            "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Bildschirmauflösung wurde geändert"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Einige Fenster könnten verschoben werden um in die herabgesetzte Auflösung "
@@ -5421,48 +5528,50 @@ msgstr "Umgebungseffekte"
 msgid "max"
 msgstr "Max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Partikeldetail"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Partikelphysik"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Gammakontrolle aktiveren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Spielfenster zentrieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Bildschirmschoner erlauben"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr "Sceenshots"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr "Wasserzeichen zu Screenshot hinzufügen"
 
@@ -5507,6 +5616,7 @@ msgstr "Spieler: %u/%u"
 msgid "Invited user %s to guild %s."
 msgstr "%s in die Gilde %s eingeladen."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5552,11 +5662,13 @@ msgstr "NAV"
 msgid "Portals: %u/%u"
 msgstr "Portale: %u/%u"
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Benutzer %s zur Gruppe einladen."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5611,208 +5723,218 @@ msgstr "Sichtbare Spieler: %d"
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Wer ist Online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "HIF"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "QE"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Quests"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "TS"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Tötungsstatistik"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Similies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "AUS"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Ausrüstung"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventar"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr "EK"
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Einkaufswagen"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "KAR"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "FÄH"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Fähigkeiten"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOZ"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Sozial"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "KB"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "ZS"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "WW"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "WDS"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Wusstest du schon?"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "STD"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "RS"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr "UP"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr "Updates"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr "BA"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Bank"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr "NA"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr "Nachricht"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "FL"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "EINST"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Taste: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Geld in der Bank: %s"
@@ -5842,7 +5964,7 @@ msgstr "Menge:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Erstellen"
 
@@ -6073,7 +6195,7 @@ msgstr "Passwort"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Spielen"
@@ -6089,23 +6211,23 @@ msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Account %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr "Bitte neuen Pincode eingeben"
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr "Bitte einen neuen Namen eingeben"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6120,27 +6242,28 @@ msgstr ""
 "Erfahrung: %u\n"
 "Geld: %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr "Gebe deine E-Mail ein, um den Charakter zu löschen"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr "E-Mail eingeben:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Gib dein Passwort ein, um den Charakter zu löschen"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
@@ -6162,7 +6285,8 @@ msgid "Broken nick detected: "
 msgstr "Defekter Spielername entdeckt: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "%ss Haustier"
@@ -6325,12 +6449,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr "Anfrage, Karte einzulegen"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Lege %s in %s ein?"
@@ -6563,8 +6687,9 @@ msgid "Money:"
 msgstr "Geld:"
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr "Gegenstand:"
 
@@ -6599,7 +6724,8 @@ msgstr "Zeit:"
 msgid "From:"
 msgstr "Von:"
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr "Anhang herausnehmen"
 
@@ -6623,6 +6749,7 @@ msgstr "Zurück senden"
 msgid "Open"
 msgstr "Öffnen"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Balken: Gesundheit"
@@ -6662,6 +6789,7 @@ msgstr "Balken: Pfeile"
 msgid "status bar"
 msgstr "Balken: Status"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "Balken: Job"
@@ -6870,13 +6998,14 @@ msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Persönlicher Stand"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr "Veröffentlichen"
 
@@ -6895,23 +7024,47 @@ msgstr "Links in Ankündigungen anzeigen"
 msgid "Please enter new shop name"
 msgstr "Bitte neuen Namen für den Stand eingeben"
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr "Verstecke"
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+#, fuzzy
+msgid "error: player busy"
+msgstr "Spieler nach oben bewegen"
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s möchte %s %s akzeptierst du?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s möchte %s %s akzeptierst du?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Handel anfordern"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s möchte %s %s akzeptierst du?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Persönlicher Stand - %s"
@@ -6922,36 +7075,37 @@ msgid "Up"
 msgstr "Hoch"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeitenset %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Fähigkeit fehlgeschlagen: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Text zum Skill %s hinzufügen"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr "Text: "
 
@@ -7055,21 +7209,23 @@ msgstr "%s hat dich in seine Gruppe eingeladen."
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Gruppe %s teilzunehmen."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Gruppeneinladung annehmen"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Konnte keine Gruppe erstellen. Du bist schon in einer Gruppe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Gruppenname"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Name deiner Gruppe wählen."
 
@@ -7246,27 +7402,28 @@ msgstr "Aktualisiere..."
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr "Alle Neuigkeiten anzeigen (Kann langsam sein)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 Updateprozess wurde nicht abgeschlossen."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen, dass"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1 du es später noch einmal versuchst."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Fertig"
 
@@ -8725,284 +8882,319 @@ msgstr "Charakter nicht gefunden."
 msgid "Failed to delete character."
 msgstr "Konnte Charakter nicht löschen."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr "Kann keine Fähigkeiten in diesem Bereich wirken."
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr "Kann Gegenstände in diesem Bereich nicht benutzen."
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr "Kann das nicht ausrüsten. Falsches Level."
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr "Kann das nicht benutzen. Falsches Level."
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr "Ist in Arbeit."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Nachricht konnte nicht gesendet werden, Kanal %s gibt es nicht."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Kann Kanal nicht öffnen. Kanal %s gibt es nicht."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr "Stärke %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr "Beweglichkeit %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr "Gesundheit %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligenz %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr "Geschick %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr "Glück %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Stärke"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Beweglichkeit"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Gesundheit"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Intelligenz"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Geschick"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Glück"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Verteidigung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "M.Angriff:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Genauigkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ausweichen"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Kritisch"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Angriffsverzug"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Laufverzug:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Angriffsbereich"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Schaden/Sek."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr "Karma"
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr "Verhalten"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Authentifizierung fehlgeschlagen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Keine Server verfügbar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Jemand anderes versucht diesen Account zu benutzen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Geschwindigkeits-Hack festgestellt."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr "Server ist voll."
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr "Tut uns leid, aber du bist minderjährig."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Mehrfache Anmeldung."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr "Zu viele Verbindungen von der selben IP."
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr "Für diese Zeit nicht bezahlt."
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr "Zahlung eingestellt."
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr "Zahlung geändert."
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr "Falsche Zahlungs IP."
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr "Spielraum bezahlen."
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr "Erzwungene Trennung von einem GM."
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr "Japanische IP sind nicht erlaubt."
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr "Verbliebender anderer Account."
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr "Unsaubere IP."
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr "Jede IP zählen."
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr "IP zählen."
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr "Speicher."
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr "?Han? : Bann gültig."
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr "Begrenzter IP Zugang."
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr "Über Charakterliste."
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr "IP blockiert."
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr "Ungültige Passwortanzahl."
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr "Keine erlaubte Rasse."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Unbekannter Verbindungsfehler."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr "Karte nicht gefunden"
 
@@ -9035,103 +9227,116 @@ msgstr "Altes Passwort falsch."
 msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Du hast eine neue Nachricht von %s mit dem Betreff %s"
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Gilden Level: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Unbekannter Fähigkeitsfehler: %d"
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Unbekannter Fähigkeitsfehler: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Dein Level ist noch nicht hoch genug!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Unzureichende HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Unzureichende SP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Du hast keine Erinnerungen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Das kannst du im Moment nicht tun!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Sieht aus, als ob du mehr Geld brauchst.... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kannst die Fähigkeit nicht mit dieser Art von Waffe benutzen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Du brauchst ein weiteres rotes Juwel!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Du brauchst ein weiteres blaues Juwel!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Du trägst zu viel mit dir herum, um das zu tun!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr "Beschwörung fehlgeschlagen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr "Geister benötigt."
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr "Gegenstand %s benötigt."
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Gegenstand %s und Menge %d benötigt."
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr "Gegenstand %s benötigt."
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Gegenstand %s benötigt und Menge %d"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr "Warp Ziel auswählen"
 
@@ -9845,7 +10050,8 @@ msgstr "Haustierfang fehlgeschlagen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+#, fuzzy
+msgid "Pet caught."
 msgstr "Haustier gefangen."
 
 #. TRANSLATORS: notification message
@@ -10402,12 +10608,12 @@ msgid "%d minutes"
 msgstr "%d Minuten"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d Sekunden"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
diff --git a/po/es.po b/po/es.po
index 24bb15e7f..fb3f47dc4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2016-01-03 16:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
@@ -49,21 +49,21 @@ msgstr "Archivo subido"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -79,35 +79,38 @@ msgid "Cache cleaned"
 msgstr "Caché limpiada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Variables de entorno vaciadas"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Configuraciones subidas a:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Configuraciones del servidor subidas a:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Registro subido a:"
 
@@ -143,6 +146,7 @@ msgstr "Falta el nombre del gremio."
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
@@ -161,7 +165,8 @@ msgstr "Volver ahora a cambiar de chat."
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr "tiene puesto el sombrero %s."
@@ -256,7 +261,8 @@ msgstr "Valor de configuración: %s"
 msgid "Server config value: %s"
 msgstr "Valor de configuración del servidor: %s"
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr "Renombrar tu mascota"
 
@@ -270,8 +276,9 @@ msgstr "Ignorando las peticiones de intercambio"
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr "Rápido"
 
@@ -285,6 +292,7 @@ msgstr "Visibles en el mapa"
 msgid "Human"
 msgstr "Humano"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "evade"
@@ -365,53 +373,53 @@ msgstr[1] "Recogiste %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "trabajo"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr "maná"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Seguimiento cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitación: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Tú ves %s"
@@ -421,8 +429,8 @@ msgstr "Tú ves %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -447,9 +455,9 @@ msgid "Floating bubble"
 msgstr "Burbuja flotante"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configuración"
@@ -481,8 +489,9 @@ msgid "About"
 msgstr "Acerca de..."
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ayuda"
@@ -546,9 +555,12 @@ msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -559,7 +571,7 @@ msgstr "Cambiando servidores del juego"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -755,32 +767,37 @@ msgstr "Servidor de actualización inválido: %s."
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd archivoOrigen colorTinte archivoDestino"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "o"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
@@ -1210,7 +1227,7 @@ msgstr "Mensaje"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Revivir"
 
@@ -1232,10 +1249,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "predeterminado"
 
@@ -1396,8 +1414,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1728,14 +1746,14 @@ msgstr "Crear grupo"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1787,13 +1805,17 @@ msgstr "Intercambio"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1855,8 +1877,9 @@ msgstr "Mover"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Hablar"
 
@@ -1869,11 +1892,12 @@ msgstr "Hablar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1886,11 +1910,12 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vender"
 
@@ -1899,7 +1924,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Agregar comentario"
 
@@ -1925,7 +1950,7 @@ msgstr "Agregar a la lista de ataque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
@@ -1980,9 +2005,10 @@ msgstr "Quitárselo"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -2008,8 +2034,8 @@ msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
@@ -2021,8 +2047,8 @@ msgstr "Recoger"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
@@ -2037,8 +2063,8 @@ msgstr "Mapa Objeto"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Quitar"
 
@@ -2046,7 +2072,7 @@ msgstr "Quitar"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Saltar a"
 
@@ -2058,11 +2084,11 @@ msgstr "Mover cámara"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Vestimenta"
@@ -2074,8 +2100,8 @@ msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Hechizos"
 
@@ -2141,8 +2167,8 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
@@ -2168,43 +2194,57 @@ msgstr "Desbloquear"
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Nombre:                  "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Comentario del jugador    "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Comentario:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Agregar el intercambio todo-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
@@ -2213,50 +2253,66 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Almacenar todo-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Almacenar todo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Recuperar todo-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
@@ -2264,58 +2320,59 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Limpiar ventana de drop"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr "Abrir configuraciones de la barra amarilla"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2323,30 +2380,30 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Mostrar ventana"
 
@@ -2354,7 +2411,7 @@ msgstr "Mostrar ventana"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2363,202 +2420,206 @@ msgstr "Nivel: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr "Nivel máximo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Invitar al grupo"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr "Unirse al chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Proteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Tirar todo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "Chequear IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Ir a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Expulsar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr "Enmudecer %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr "Desenmudecer %d"
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr "Nivel: %d / %d"
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr "Nivel: Desconocido"
@@ -2569,17 +2630,17 @@ msgid "Basic"
 msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Atajos"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Ventanas"
 
@@ -2593,9 +2654,10 @@ msgstr "Emotes"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
@@ -2607,9 +2669,9 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2696,10 +2758,12 @@ msgstr "Homúnculo"
 msgid "Skill unit"
 msgstr "Unidad de Habilidad"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Miembros de tu grupo"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Miembros del gremio"
@@ -2882,14 +2946,17 @@ msgstr "Borde de marca Home"
 msgid "Road point"
 msgstr "Punto de recorrido"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Nivel: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2984,7 +3051,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
@@ -3003,7 +3070,7 @@ msgstr "Tipo: %s"
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -3037,12 +3104,14 @@ msgstr "Atrapar objetivo"
 msgid "Unknown:"
 msgstr "Desconocido:"
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr "Alcance: %d"
@@ -3553,7 +3622,8 @@ msgstr "Ventana"
 msgid "Auto hide chat window"
 msgstr "Ocultar automáticamente la ventana del chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3564,11 +3634,12 @@ msgstr ""
 "Presiona Enter o pasa el ratón por encima para mostrarla nuevamente."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr "Proteger foco del chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3583,17 +3654,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Colores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Remover los colores de los mensajes recibidos en el chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
@@ -3603,11 +3675,12 @@ msgstr ""
 "predeterminado."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Mostrar lista de colores del chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3617,17 +3690,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Comandos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 "Permitir utilizar los comandos de magia y GM en todas las pestañas del chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
@@ -3635,16 +3709,17 @@ msgstr ""
 "cualquier pestaña."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Límites"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Límite máx. de caracteres por línea en el chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3654,11 +3729,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Límite máx. de líneas en el chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3668,16 +3744,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Registros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Habilitar registro de chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3685,22 +3762,24 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Habilitar registro del chat de depuración"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 "Si habilitas esto, el historial de la pestaña de depuración también será "
 "registrada en el disco."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Mostrar historial del chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
@@ -3710,11 +3789,12 @@ msgstr ""
 "pestañas vacías."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr "Mostrar mensajes de conexión de miembros del grupo"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3724,11 +3804,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Mostrar mensajes de conexión de miembros del gremio"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3743,16 +3824,17 @@ msgstr ""
 "compañeros se conectan."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Mensajes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Ocultar mensajes de la tienda"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3764,11 +3846,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Mostrar mensajes MVP"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3779,17 +3862,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Pestañas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Poner todos los susurros en pestañas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3800,11 +3884,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Registrar mensajes de magia en la pestaña del depurador"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3813,11 +3898,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3827,11 +3913,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Habilitar pestaña de intercambio"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3840,11 +3927,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Habilitar pestaña para GM"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3854,11 +3942,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Habilitar pestaña de lenguaje"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3871,11 +3960,12 @@ msgstr ""
 "Nota: Por ahora, sólo es soportado por el servidor Evol."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Mostrar mensajes de todos los lenguajes"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3885,11 +3975,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Habilitar pestaña de batalla"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3899,11 +3990,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalla"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3911,11 +4003,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Si hace falta, cambia el tamaño de las pestañas del chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3926,16 +4019,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Tiempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Usar hora local"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
@@ -3945,11 +4039,12 @@ msgstr ""
 "es GTM+0)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Resaltar palabras (separadas por coma)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3958,11 +4053,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr "Ignorar nombres globalmente (separados por coma)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3971,11 +4067,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr "Mostrar botón de emoticonos en el chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3986,11 +4083,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr "Mostrar el mensaje motd del servidor al iniciar"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -3999,6 +4097,7 @@ msgstr ""
 "mensaje del día) una vez que te conectes al servidor. Deshabilita para "
 "ocultar el MOTD."
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Así es como luce este color"
@@ -4010,7 +4109,7 @@ msgstr "Tipo:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Retraso:"
 
@@ -4031,33 +4130,33 @@ msgstr "Azul:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Estático"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Pulso"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Arco iris"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Espectro"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -4266,9 +4365,10 @@ msgid "Cycle monster targets"
 msgstr "Apuntar cíclicamente a los monstruos, no necesariamente al más cercano"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4379,241 +4479,243 @@ msgstr "Movimientos relativos del ratón (bueno para interfaces táctiles)"
 msgid "Player"
 msgstr "Jugador"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Mostrar barra de HP propia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Habilitar estadísticas rápidas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Apuntar cíclicamente los jugadores, no necesariamente al más cercano"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Mostrar mensajes de experiencia de trabajo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Mensaje afk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Mostrar trabajo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Habilitar filtro de recogido"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Habilitar el protocolo de anuncio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr "Soporte para mascotas habilitado"
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Habilitar notificaciones de peso"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Tienda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Aceptar solicitudes de compra/venta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 "Seleccionar cíclicamente los npcs en derredor, no necesariamente al más "
 "cercano"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Registrar diálogos de NPCs"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Soporte de bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Habilitar soporte para el bot 'guild' y deshabilitar soporte de gremio nativo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr "Habilitar soporte para el bot 'ManaMarket'"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Retraso en repetición"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Intervalo de repetición"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Intervalo de repetición personalizado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "Atajos"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Tipo de proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Dirección de proxy:puerto"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Habilitar el ataque del lado del servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 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_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr "Habilitar doble clics"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Habilitar inspector de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 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_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr "Ignorar registro de paquetes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr "Registrar paquetes sin implementar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Habilitar registro OpenGl"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Habilitar registro de entrada"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Subir archivo de registro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 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_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr "Directorio de capturas de pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Retraso de red entre sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Mostrar fondo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Sobrescribir densidad de pantalla"
 
@@ -4884,13 +4986,14 @@ msgstr "Permitir intercambios"
 msgid "Allow whispers"
 msgstr "Permitir mensajes privados"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4898,12 +5001,12 @@ msgid "Delete"
 msgstr "Borrar"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Relaciones"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Cuando se ignora a alguien:"
 
@@ -4973,30 +5076,31 @@ msgstr "Tamaño de letra en NPC"
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Nombre: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "Copyright:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Info del tema"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el cliente para que los cambios surtan efecto."
 
@@ -5089,8 +5193,8 @@ msgstr "Límite de FPS:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Límite alternativo de FPS: "
 
@@ -5120,16 +5224,18 @@ msgid "No frame"
 msgstr "Sin marco"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Nada"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5137,7 +5243,7 @@ msgstr ""
 "también falló!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5145,42 +5251,43 @@ msgstr ""
 "modo anterior también falló!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios surtan efecto."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar el cambio a OpenGL."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:        "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
@@ -5298,48 +5405,50 @@ msgstr "Efectos de ambiente"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Detalle de partícula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Particle physics"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Habilitar control gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Centrar ventana del juego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Permitir ejecución de protector de pantalla"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr "Capturas de Pantalla"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr "Agregar marca de agua en las capturas de pantalla"
 
@@ -5384,6 +5493,7 @@ msgstr "Jugadores: %u/%u"
 msgid "Invited user %s to guild %s."
 msgstr "Jugador %s invitado al gremio %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5429,11 +5539,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr "Portales: %u/%u"
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Jugador %s invitado al grupo."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5488,208 +5600,218 @@ msgstr "Jugadores visibles: %d"
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Quién está conectado"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "QE"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Misiones"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "KS"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Estadísticas"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Emotíconos"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Estado"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EQU"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Equipamiento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventario"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr "CA"
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Mochila"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "SKI"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "YK"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "¿Sabías que..."
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr "UP"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr "Actualizaciones"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr "BA"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banco"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr "MA"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr "Correo"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Dinero en el banco: %s"
@@ -5719,7 +5841,7 @@ msgstr "Cantidad:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crear"
 
@@ -5954,7 +6076,7 @@ msgstr "Contraseña"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Jugar"
@@ -5970,23 +6092,23 @@ msgid "Info"
 msgstr "Información"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Cuenta %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr "Por favor, crea un nuevo código pin"
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr "Por favor, ingresa un nuevo nombre"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6001,27 +6123,28 @@ msgstr ""
 "Experiencia: %u\n"
 "Dinero: %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr "Ingresa tu correo para borrar el personaje"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr "Ingresa tu correo:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Ingrese la contraseña para borrar el personaje"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
@@ -6043,7 +6166,8 @@ msgid "Broken nick detected: "
 msgstr "Nombre roto detectado: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "Mascota de %s"
@@ -6207,12 +6331,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr "Inserta la tarjeta requerida"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "¿Insertar %s en %s?"
@@ -6445,8 +6569,9 @@ msgid "Money:"
 msgstr "Dinero:"
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr "Artículo:"
 
@@ -6481,7 +6606,8 @@ msgstr "Tiempo:"
 msgid "From:"
 msgstr "De:"
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6505,6 +6631,7 @@ msgstr "Regresar"
 msgid "Open"
 msgstr "Abrir"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "barra de salud"
@@ -6544,6 +6671,7 @@ msgstr "barra de flechas"
 msgid "status bar"
 msgstr "barra de estado"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "barra de trabajo"
@@ -6754,13 +6882,14 @@ msgid "Reset Windows"
 msgstr "Restablecer ventanas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Tienda personal"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr "Publicar"
 
@@ -6779,23 +6908,47 @@ msgstr "Mostrar enlaces en el anuncio"
 msgid "Please enter new shop name"
 msgstr "Por favor, introduce el nuevo nombre de la tienda"
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr "Des-publicar"
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+#, fuzzy
+msgid "error: player busy"
+msgstr "Mover el jugador hacia arriba"
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s quiere %s %s ¿aceptas?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s quiere %s %s ¿aceptas?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s quiere %s %s ¿aceptas?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Tienda Personal - %s"
@@ -6806,36 +6959,37 @@ msgid "Up"
 msgstr "Incrementar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Puntos disponibles: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Habilidad fallida: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Añadir texto a la habilidad %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr "Texto: "
 
@@ -6939,21 +7093,23 @@ msgstr "%s te ha invitado a unirte a su grupo."
 msgid "%s has invited you to join the %s party."
 msgstr "%s te ha invitado a unirte al grupo %s."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "No se pudo crear el grupo; ya estás en uno."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Escoge el nombre de tu grupo."
 
@@ -7130,27 +7286,28 @@ msgstr "Actualizando..."
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr "Mostrar todas las noticias (puede ser lento)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 El proceso de actualización está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Se recomienda encarecidamente que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo más tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Completado"
 
@@ -8610,284 +8767,319 @@ msgstr "Personaje no encontrado."
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr "No puedes lanzar la habilidad en esta área."
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr "No puedes usar el artículo en esta área."
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr "No puedes equipar. Nivel equivocado."
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr "No puedes usar. Nivel equivocado."
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr "Trabajo en progreso."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "El mensaje no se pudo enviar, el canal %s no existe."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "No se puede abrir el cana. El canal %s no existe."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr "Fuerza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr "Agilidad %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalidad %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligencia %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr "Suerte %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "¡Desconectado del servidor!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Fuerza"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Agilidad"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitalidad"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Inteligencia"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Destreza"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Suerte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Defensa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "Ataque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "Defensa M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% de Precisión"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% de Evasión"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% de Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Retraso de Ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Retraso de Marcha"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Rango de Ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Daño por segundo."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr "Karma"
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr "Comportamiento"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Autenticación fallida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "No hay servidores disponibles."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Alguien más está tratando de usar esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Ya hay alguien conectado con esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Speed hack detectado."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr "Servidor lleno."
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr "Lo siento, tú eres menor de edad."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Inicio de sesión duplicada."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr "Muchas conecciones desde la misma IP."
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr "No pagas esta vez."
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr "Pago suspendido."
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr "Pago cambiado."
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr "Desconección forzada por GM."
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr "Rechazo de censura japonesa."
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr "Memoria."
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr "Over characters list."
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr "IP bloqueada."
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr "Conteo inválido de contraseña."
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr "Raza no permitida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Error de conexión desconocido."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr "Mapa no encontrado"
 
@@ -8920,103 +9112,116 @@ msgstr "Contraseña anterior incorrecta."
 msgid "New password too short."
 msgstr "Nueva contraseña es muy corta."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Tienes un nuevo correo de %s, con el asunto %s"
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Nivel del gremio: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Error de habilidad desconocido: %d"
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Error de habilidad desconocido: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "¡Insuficiente HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "¡SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "¡No tienes ningún memo!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "¡No puedes hacer esto ahora mismo!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que necesitas más dinero... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "¡Necesitas otra gema roja!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "¡Necesitas otra gema azul!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "¡Estás llevando muchas cosas para hacer esto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9724,7 +9929,8 @@ msgstr "Captura fallida de mascota."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+#, fuzzy
+msgid "Pet caught."
 msgstr "Mascota capturada."
 
 #. TRANSLATORS: notification message
@@ -10280,12 +10486,12 @@ msgid "%d minutes"
 msgstr "%d minutos"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
diff --git a/po/fi.po b/po/fi.po
index e3c8b61b9..b29681b5e 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
@@ -37,21 +37,21 @@ msgstr ""
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -67,35 +67,38 @@ msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -130,6 +133,7 @@ msgstr "Killan nimi puuttuu."
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
@@ -148,7 +152,8 @@ msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -243,7 +248,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -257,8 +263,9 @@ msgstr "Et huomioi kaupankäyntipyyntöjä"
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -272,6 +279,7 @@ msgstr "Näkyvillä kartalla"
 msgid "Human"
 msgstr ""
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "väistö"
@@ -352,53 +360,53 @@ msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -408,8 +416,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -434,9 +442,9 @@ msgid "Floating bubble"
 msgstr "Leijuva puhekupla"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Asetukset"
@@ -468,8 +476,9 @@ msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Apua"
@@ -533,9 +542,12 @@ msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -546,7 +558,7 @@ msgstr "Vaihdan pelipalvelinta"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -740,32 +752,37 @@ msgstr ""
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1195,7 +1212,7 @@ msgstr "Viesti"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr ""
 
@@ -1214,10 +1231,11 @@ msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "oletus"
 
@@ -1378,8 +1396,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1710,14 +1728,14 @@ msgstr "Luo ryhmä"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1769,13 +1787,17 @@ msgstr "Tee kaupat"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Hyökkää"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1837,8 +1859,9 @@ msgstr "Liiku"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Keskustele"
 
@@ -1851,11 +1874,12 @@ msgstr "Keskustele"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Osta"
 
@@ -1868,11 +1892,12 @@ msgstr "Osta"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Myy"
 
@@ -1881,7 +1906,7 @@ msgstr "Myy"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
@@ -1907,7 +1932,7 @@ msgstr "Lisää hyökkäyslistaan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
@@ -1962,9 +1987,10 @@ msgstr "Poista varuste käytöstä"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
@@ -1990,8 +2016,8 @@ msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
@@ -2003,8 +2029,8 @@ msgstr "Poimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
@@ -2019,8 +2045,8 @@ msgstr "Karttaolio"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Poista"
 
@@ -2028,7 +2054,7 @@ msgstr "Poista"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Warppaa"
 
@@ -2040,11 +2066,11 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
@@ -2056,8 +2082,8 @@ msgid "Clear outfit"
 msgstr "Poista asu"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Loitsut"
 
@@ -2123,8 +2149,8 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
@@ -2150,43 +2176,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
@@ -2195,50 +2235,66 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Varastoi"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Varastoi 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Varastoi puolet"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
@@ -2246,58 +2302,59 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2305,30 +2362,30 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr ""
 
@@ -2336,7 +2393,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2345,202 +2402,206 @@ msgstr "Taso: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ohita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Potki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2551,17 +2612,17 @@ msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2575,9 +2636,10 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Keskustelu"
 
@@ -2589,9 +2651,9 @@ msgstr "Keskustelu"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2678,10 +2740,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
@@ -2864,14 +2928,17 @@ msgstr ""
 msgid "Road point"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2966,7 +3033,7 @@ msgstr "Muokkaa"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
@@ -2985,7 +3052,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3019,12 +3086,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3535,7 +3604,8 @@ msgstr ""
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3543,11 +3613,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3558,28 +3629,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Värit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Poista värit saapuneista keskusteluviesteistä"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Näytä keskustelun värilista"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3589,31 +3662,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Komennot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Salli magia ja GM-komennot kaikilla keskusteluvälilehdillä"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Rajat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Keskusteluviestin pituusraja"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3623,11 +3698,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Keskusteluvälilehden riviraja"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3637,16 +3713,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Lokit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Kirjaa keskustelut"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3654,31 +3731,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Näytä keskusteluhistoria"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3688,11 +3768,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3702,16 +3783,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Viestit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Piilota kauppaviestit"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3723,11 +3805,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Näytä MVP-viestit"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3738,17 +3821,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Välilehdet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Laita kaikki kuiskaukset välilehtiin"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3759,11 +3843,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Kirjaa magiaviestit debug-välilehdelle"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3772,11 +3857,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Näytä palvelinviestit debug-välilehdellä"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3786,11 +3872,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Ota kaupankäyntivälilehti käyttöön"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3799,11 +3886,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3813,11 +3901,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3826,11 +3915,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3840,11 +3930,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Ota taisteluvälilehti käyttöön"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3854,11 +3945,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Näytä taistelutapahtumat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3866,11 +3958,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Muuta välilehden kokoa tarpeen mukaan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3881,27 +3974,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Aika"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Käytä paikallista aikaa"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Korosta sanat (pilkuin erotettu)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3910,11 +4005,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3923,11 +4019,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3938,16 +4035,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Väri näyttää tältä"
@@ -3959,7 +4058,7 @@ msgstr "Tyyppi:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Viive:"
 
@@ -3980,33 +4079,33 @@ msgstr "Sininen:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Staattinen"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Sykkivä"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Sateenkaari"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Spektri"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -4215,9 +4314,10 @@ msgid "Cycle monster targets"
 msgstr "Vaihda hirviökohteita syklissä"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4328,238 +4428,240 @@ msgstr ""
 msgid "Player"
 msgstr "Pelaaja"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Näytä oma vp-palkki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Ota pikatilastot käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Vaihda pelaajakohteita syklissä"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Näytä työkokemusviestit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Näytä pelaajaponnahdusikkunat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Poissaoloviesti"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Näytä työ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Ota käyttöön mainosprotokolla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Kauppa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Salli osta/myy-pyynnöt"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Ota kauppatila käyttöön"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Bottien tuki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ota käyttöön kiltabottien tuki ja poista sisäinen kiltatuki käytöstä"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 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_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Näytä tausta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4826,13 +4928,14 @@ msgstr "Salli kaupakäynti"
 msgid "Allow whispers"
 msgstr "Salli kuiskaukset"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4840,12 +4943,12 @@ msgid "Delete"
 msgstr "Poista"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Suhteet"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Kun jätät huomiotta:"
 
@@ -4915,30 +5018,31 @@ msgstr ""
 msgid "i"
 msgstr ""
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
@@ -5031,8 +5135,8 @@ msgstr "Piirtonopeusrajoitin (FPS):"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin: "
 
@@ -5062,63 +5166,66 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "-"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Oma tarkkuus (esim. 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Anna uusi tarkkuus:                  "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
@@ -5236,48 +5343,50 @@ msgstr "Taustaäänet"
 msgid "max"
 msgstr "maksimi"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5322,6 +5431,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr "Kutsuit käyttäjän %s kiltaan %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5367,11 +5477,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Käyttäjä %s kutsuttu ryhmään."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5426,208 +5538,218 @@ msgstr ""
 msgid "ONL"
 msgstr "LIN"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Kuka on linjoilla"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "TT"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Tappotilastot"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Hymiöt"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "Tie"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Hahmon tiedot"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "Var"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Varusteet"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "Tav"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Tavarat"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Kärry"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "Tai"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Taidot"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "Sos"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Suhteet"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "PV"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "Lo"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "Pu"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "T?"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Tiesitkö"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "Ase"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Näppäin: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5657,7 +5779,7 @@ msgstr "Määrä:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Luo"
 
@@ -5888,7 +6010,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Pelaa"
@@ -5904,23 +6026,23 @@ msgid "Info"
 msgstr "Tietoja"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5930,27 +6052,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Väärä salasana"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Anna salasana hahmon poistamiseksi"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Salasana:"
 
@@ -5972,7 +6095,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6135,12 +6259,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6373,8 +6497,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6409,7 +6534,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6433,6 +6559,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "terveyspalkki"
@@ -6472,6 +6599,7 @@ msgstr "nuolipalkki"
 msgid "status bar"
 msgstr "tilapalkki"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "työpalkki"
@@ -6680,13 +6808,14 @@ msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Oma kauppa"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6705,23 +6834,46 @@ msgstr "Näytä linkit ilmoituksessa"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s haluaa %s %s - hyväksytkö?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s haluaa %s %s - hyväksytkö?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s haluaa %s %s - hyväksytkö?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6732,36 +6884,37 @@ msgid "Up"
 msgstr "Ylös"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "%d taitopistettä käyttämättä"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Taitojoukko %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Taito %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6865,21 +7018,23 @@ msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 msgid "%s has invited you to join the %s party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
@@ -7054,27 +7209,28 @@ msgstr "Päivitetään..."
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Valmis"
 
@@ -8529,284 +8685,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Yhteys palvelimeen katkesi!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Voima"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Ketteryys"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Elinvoima"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Älykkyys"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Näppäryys"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Tuuri"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Puolustus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "T.-hyökkäys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "T.-puolustus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Tarkkuus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Välttö"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Täysosuma"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Hyökkäysviive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Kävelyviive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Hyökkäyskantama"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Vahinko sekunnissa."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Tunnistus epäonnistui."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Palvelimia ei saatavilla."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Joku muu yrittää käyttää tätä tunnusta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Tällä tunnuksella on jo kirjauduttu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Nopeusviritelmä havaittu."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Kaksinkertainen sisäänkirjautuminen."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Tuntematon yhteysongelma."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8839,103 +9030,116 @@ msgstr "Vanha salsana on väärä."
 msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Kiltataso: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Et ole vielä riittävän korkealla tasolla!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Voimapisteesi eivät riitä!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Manapisteesi eivät riitä!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Sinulla ei ole muistioita (memo)!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Et voi tehdä tätä juuri nyt!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Näyttää siltä että tarvitset lisää rahaa... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Tarvitset toisen punaisen helmen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Tarvitset toisen sinisen helmen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Kannat liian paljon tehdäksesi tällaista!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9644,7 +9848,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10191,12 +10395,12 @@ msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d sekuntia"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 92c097eb1..f79eb39f9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2016-01-03 17:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
@@ -51,21 +51,21 @@ msgstr "Fichier mis en ligne"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -81,35 +81,38 @@ msgid "Cache cleaned"
 msgstr "Cache nettoyé"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Variables d'environnement effacées"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Config ajouté dans :"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Config serveur ajouté dans :"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Historique ajouté dans :"
 
@@ -146,6 +149,7 @@ msgstr "Le nom de la guilde est manquant."
 msgid "Please specify a name."
 msgstr "Indiques un nom."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "La touche <Entrée> ferme la ligne d'entrée de la conversation."
@@ -165,7 +169,8 @@ msgstr ""
 msgid "Message now closes chat."
 msgstr "Le message ferme maintenant la conversation."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr "chapeau équipé %s."
@@ -260,7 +265,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr "Renommer ton familier"
 
@@ -274,8 +280,9 @@ msgstr "Ignorer les requêtes d'échanges entrantes"
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -289,6 +296,7 @@ msgstr "Visible sur la carte"
 msgid "Human"
 msgstr "Humain"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "esquive"
@@ -369,53 +377,53 @@ msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr "PV"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr "Mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Suivre : %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiter : %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Tu vois %s"
@@ -425,8 +433,8 @@ msgstr "Tu vois %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -451,9 +459,9 @@ msgid "Floating bubble"
 msgstr "Bulle flottante"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configuration"
@@ -485,8 +493,9 @@ msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aide"
@@ -550,9 +559,12 @@ msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -563,7 +575,7 @@ msgstr "Changement de serveur de jeu"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -763,33 +775,38 @@ msgstr "Hôte de mise à jour invalide : %s."
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mises à jour !"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 "Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "ou"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Débogage"
@@ -1220,7 +1237,7 @@ msgstr "Message"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Ressusciter"
 
@@ -1243,10 +1260,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "défaut"
 
@@ -1407,8 +1425,8 @@ msgstr "Énorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1739,14 +1757,14 @@ msgstr "Créer un groupe"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1798,13 +1816,17 @@ msgstr "Échange"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Attaquer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1866,8 +1888,9 @@ msgstr "Déplacement"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Parler"
 
@@ -1880,11 +1903,12 @@ msgstr "Parler"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Acheter"
 
@@ -1897,11 +1921,12 @@ msgstr "Acheter"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vendre"
 
@@ -1910,7 +1935,7 @@ msgstr "Vendre"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
@@ -1936,7 +1961,7 @@ msgstr "Ajouter à la liste d'attaque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
@@ -1991,9 +2016,10 @@ msgstr "Retirer"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Renommer"
 
@@ -2019,8 +2045,8 @@ msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Éjecter du groupe"
 
@@ -2032,8 +2058,8 @@ msgstr "Ramasser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
@@ -2048,8 +2074,8 @@ msgstr "Objet de carte"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Enlever"
 
@@ -2057,7 +2083,7 @@ msgstr "Enlever"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Téléportation"
 
@@ -2069,11 +2095,11 @@ msgstr "Bouger la caméra"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Costumes"
@@ -2085,8 +2111,8 @@ msgid "Clear outfit"
 msgstr "Effacer la tenue"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Sortilèges"
 
@@ -2152,8 +2178,8 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
@@ -2179,43 +2205,57 @@ msgstr "Déverouiller"
 msgid "Lock"
 msgstr "Verouiller"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Nom :                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Le joueur commente        "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Commentaire :                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Ajouter pour échanger tout-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
@@ -2224,50 +2264,66 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Tout entreposer-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Entreposer tout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Tout retirer-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
@@ -2275,58 +2331,59 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépôt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr "Ouvrir la fenêtre de réglages de la barre jaune"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Remise à zéro des valeurs de la barre jaune"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2334,30 +2391,30 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
@@ -2365,7 +2422,7 @@ msgstr "Afficher la fenêtre"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2374,202 +2431,206 @@ msgstr "Niveau : %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr "Rejoindre la conversation %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Retirer de la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Ajouter à la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Objet protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Déposer..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Déposer tout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Déposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "Vérifier ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Aller à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Virer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr "Mettre en silence %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr "Redonner la parole à %d"
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2580,17 +2641,17 @@ msgid "Basic"
 msgstr "Basique"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fenêtres"
 
@@ -2604,9 +2665,10 @@ msgstr "Emoticônes"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Conversation"
 
@@ -2618,9 +2680,9 @@ msgstr "Conversation"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2707,10 +2769,12 @@ msgstr "Homoncule"
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Membres du groupe"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Membres de la guilde"
@@ -2893,14 +2957,17 @@ msgstr "Limites du lieu de vie"
 msgid "Road point"
 msgstr "Point de route"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Niveau : %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2995,7 +3062,7 @@ msgstr "Éditer"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
@@ -3014,7 +3081,7 @@ msgstr "Type : %s"
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -3048,12 +3115,14 @@ msgstr "Cibler le piège"
 msgid "Unknown:"
 msgstr "Inconnu :"
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana : -%d"
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr "Portée : %d"
@@ -3564,7 +3633,8 @@ msgstr "Fenêtre"
 msgid "Auto hide chat window"
 msgstr "Automatiquement cacher la fenêtre de conversation"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3572,11 +3642,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr "Protéger la concentration de la conversation"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3587,28 +3658,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Couleurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Retirer les couleurs des messages des conversations"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Afficher la liste des couleurs de conversation"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3618,33 +3691,35 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Commandes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 "Autoriser les messages de magie et commandes des MJ dans tous les onglets de "
 "conversation"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Limites"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Limiter le nombre max de car de la ligne de conversation"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3654,11 +3729,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Limiter le nombre max de lignes dans les conversations"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3668,16 +3744,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Historiques"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Activer l'historique des conversations"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3685,31 +3762,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Activer le débogage de l'historique des conversations"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Afficher l'historique de conversation"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr "Afficher les messages de connexion du groupe"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3719,11 +3799,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Afficher les messages en ligne de la guilde"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3733,16 +3814,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Messages"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Masquer les messages liés à la boutique"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3754,11 +3836,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Montrer les messages MVP"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3769,17 +3852,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Onglets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Placer tous les messages privés dans des onglets"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3790,11 +3874,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Effectuer l'historique des messages de magie dans l'onglet de débogage"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3803,11 +3888,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Afficher les messages du serveur dans l'onglet de débogage"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3817,11 +3903,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Activer l'onglet d'échanges"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3830,11 +3917,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Activer l'onglet de MJ"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3844,11 +3932,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Activer l'onglet des langues"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3857,11 +3946,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Afficher tous les messages de langue"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3871,11 +3961,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Activer l'onglet de combat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3885,11 +3976,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Afficher les événements de combat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3897,11 +3989,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Si besoin est, changer la taille des onglets de conversation"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3912,27 +4005,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Temps"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Utiliser l’horaire local"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Mots en surbrillance (séparés par une virgule)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3941,11 +4036,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr "Ignorer de multiples noms (séparés par une virgule)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3954,11 +4050,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr "Afficher le bouton des émoticônes dans la conversation"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3969,16 +4066,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr "Afficher le message du serveur motd au démarrage"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Voilà à quoi ressemble cette couleur"
@@ -3990,7 +4089,7 @@ msgstr "Type :"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Délai :"
 
@@ -4011,33 +4110,33 @@ msgstr "Bleu :"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Statique"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Impulsion"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Spectre"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Opacité :"
 
@@ -4246,9 +4345,10 @@ msgid "Cycle monster targets"
 msgstr "Sélectionner les monstres par ordre de distance"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4359,239 +4459,241 @@ msgstr "Mouvements relatifs à la souris (bon pour les interfaces tactiles)"
 msgid "Player"
 msgstr "Joueur"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Afficher ta propre barre de vie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Activer les statistiques instantanées"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Sélectionner les joueurs par ordre de distance"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Afficher les expériences de compétences"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Message d'absence"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Afficher les compétences"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Activer le mode attaque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Activer le filtre de ramassage"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Lancer le protocole d'avertissements"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr "Possibilité des familiers activée"
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Activer les notifications de poids"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Boutique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Accepter les requêtes d'achat / de vente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Activer le mode boutique"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "PNJ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "Boucler les cibles PNJ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Effectuer l'historique des conversations des PNJs"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Support des bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Activer le support du bot de guilde et désactiver le support par défault"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr "Activer le support de bot du ManaMarket"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Clavier"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Délai de répétition"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Intervalle de répétition"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Intervalle de répétition personnalisé"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "Boutons de raccourcis"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Serveur proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Type de proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Adresse du proxy:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 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_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr "Activer double-cliques"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 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_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Activer l'historique des informations de débogage"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr "Ignorer les paquets d'identification"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr "Effectuer l'historique des paquets non implémentés"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Activer historique OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Activer l'historique d'entrées"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 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_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 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_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr "Répertoire des captures d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Retard du réseau entre les sous-serveurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Montrer le fond"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Écrasement de la densité de l'écran"
 
@@ -4868,13 +4970,14 @@ msgstr "Autoriser les échanges"
 msgid "Allow whispers"
 msgstr "Autoriser les messages privés"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4882,12 +4985,12 @@ msgid "Delete"
 msgstr "Supprimer"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Relations"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Quand vous ignorez :"
 
@@ -4957,30 +5060,31 @@ msgstr "Taille de police des PNJ"
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Nom : "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "Copyright :"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Info thème"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Thème changé"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarres le jeu pour que les changements soient appliqués."
 
@@ -5073,8 +5177,8 @@ msgstr "Limite FPS :"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alternative: "
 
@@ -5104,16 +5208,18 @@ msgid "No frame"
 msgstr "Pas d'image"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Aucun"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5121,7 +5227,7 @@ msgstr ""
 "également pas accessible !"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5129,44 +5235,45 @@ msgstr ""
 "également pas accessible !"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution personnalisée (exemple : 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Entre la nouvelle résolution:        "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
@@ -5285,48 +5392,50 @@ msgstr "Effets ambiants"
 msgid "max"
 msgstr "max."
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Détail des particules"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Physique des particules"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Activer le contrôle de gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Centrer la fenêtre de jeu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Autoriser l'économiseur d'écran à fonctionner"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr "Captures d'écran"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr "Ajouter les marques d'eau dans les captures d'écran"
 
@@ -5371,6 +5480,7 @@ msgstr "Joueurs : %u/%u"
 msgid "Invited user %s to guild %s."
 msgstr "Le joueur %s a été invité dans la guilde %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5416,11 +5526,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr "Portails : %u/%u"
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter l'utilisateur %s dans le groupe."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5475,208 +5587,218 @@ msgstr "Joueurs visibles : %d"
 msgid "ONL"
 msgstr "OnL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Qui est en ligne"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "AID"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "QE"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Quêtes"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "Sta"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Tuer les statistiques"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Émoticône"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Statut"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "Equ"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Équipement"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "Inv"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventaire"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr "CA"
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Panier"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "CRT"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "Cmp"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Compétences"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "Soc"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "Rac"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "Sor"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "Jet"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "YK"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Connaissais-tu le"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "BTQ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "TNU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr "MAJ"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr "Mises à jour"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr "CB"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banque"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr "Mail"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "FEN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "Cfg"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Touche : %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Argent dans la banque : %s"
@@ -5706,7 +5828,7 @@ msgstr "Montant :"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Créer"
 
@@ -5937,7 +6059,7 @@ msgstr "Mot de passe"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Jouer"
@@ -5953,23 +6075,23 @@ msgid "Info"
 msgstr "Informations"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Compte %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr "Définis le nouveau code pin"
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr "Merci d'entrer un nouveau nom"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5984,27 +6106,28 @@ msgstr ""
 "Expérience : %u\n"
 "Argent : %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr "Saisissez votre e-mail pour supprimer le personnage"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr "Saisissez e-mail:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Entre le mot de passe pour effacer le personnage"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Entre le mot de passe :"
 
@@ -6026,7 +6149,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "%s du familier"
@@ -6189,12 +6313,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6427,8 +6551,9 @@ msgid "Money:"
 msgstr "Argent:"
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr "Objet:"
 
@@ -6463,7 +6588,8 @@ msgstr "Heure:"
 msgid "From:"
 msgstr "De:"
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6487,6 +6613,7 @@ msgstr ""
 msgid "Open"
 msgstr "Ouvrir"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Barre de vie"
@@ -6526,6 +6653,7 @@ msgstr "Barre de flèches"
 msgid "status bar"
 msgstr "Barre de statut"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "Barre de compétences"
@@ -6734,13 +6862,14 @@ msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Boutique Personnelle"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr "Publier"
 
@@ -6759,23 +6888,47 @@ msgstr "Montrer les liens dans l'annonce"
 msgid "Please enter new shop name"
 msgstr "Merci d'entrer le nouveau nom du magasin"
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr "Supprimer"
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+#, fuzzy
+msgid "error: player busy"
+msgstr "Déplacer le joueur en haut"
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s souhaite %s %s Acceptez-vous ?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s souhaite %s %s Acceptez-vous ?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s souhaite %s %s Acceptez-vous ?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Magasin personnel - %s"
@@ -6786,36 +6939,37 @@ msgid "Up"
 msgstr "Augmenter"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Compétence choisie : %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Compétence %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Compétence ratée : %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6923,21 +7077,23 @@ msgstr "%s t'a invité à rejoindre son groupe."
 msgid "%s has invited you to join the %s party."
 msgstr "%s t'a invité à rejoindre le groupe %s."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossible de créer le groupe. vous faîtes déjà partie d'un groupe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Nom du groupe"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Choisis le nom du groupe."
 
@@ -7114,27 +7270,28 @@ msgstr "Mise à jour en cours..."
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr "Afficher toutes les nouvelles (peut être lent)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé de"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1 Essayes de nouveau plus tard."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Terminé"
 
@@ -8594,284 +8751,319 @@ msgstr "Personnage non trouvé."
 msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr "Ne peux pas lancer de compétence dans cette zone."
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr "Ne peux pas utiliser cet objet dans cette zone."
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr "Ne peux pas être équipé. Niveau insuffisant."
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr "Ne peux pas être utilisé. Niveau insuffisant."
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr "Travail en cours."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Le message n'a pas pu être envoyé, la chaîne %s n'existe pas."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Ne peut pas ouvrir la chaîne. La chaîne %s n'existe pas."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr "Force %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr "Agilité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dextérité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr "Chance %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Vous avez été déconnecté du serveur !"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Force"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Agilité"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitalité"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Intelligence"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Dextérité"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Chance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Défense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "Attaque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "Défense M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Précision"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Esquive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Coup critique"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Temps de l'attaque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Temps de déplacement"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Portée de l'attaque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Dégâts par s."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr "Karma"
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr "Manière"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Échec de l'authentification."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Aucun serveur n'est disponible."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Ce compte est déjà connecté."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Speed hack détecté."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr "Serveur plein."
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr "Désolé, vous êtes trop jeune."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Authentification déjà effectuée."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr "Trop de connexions avec la même adresse ip."
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr "Non payé pour le moment."
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr "Paiement suspendu."
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr "Paiement changé."
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr "Paie le mauvais ip."
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr "Payez le serveur."
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr "Déconnexion forcé par le MJ."
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr "Bannir le Japon refusé."
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr "L'autre compte subsiste."
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr "Adresse Ip invalide."
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr "Nombre d'adresses Ip totale."
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr "Nombre d'adresses Ip."
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr "Mémoire."
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr "Pseudonyme disponible."
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr "Adresse Ip avec accès limité."
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr "Au dessus de la liste des personnages."
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr "Adresse Ip bloquée."
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr "Taille du mot de passe invalide."
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr "Race non permise."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Erreur de connexion inconnue."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr "Carte non trouvée"
 
@@ -8904,103 +9096,116 @@ msgstr "Ancien mot de passe incorrect."
 msgid "New password too short."
 msgstr "Le nouveau mot de passe est trop court."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Niveau de la guilde : %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Erreur de compétence inconnue : %d"
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Erreur de compétence inconnue : %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Vous n'avez pas encore atteint un niveau suffisant !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Pas assez de vie !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP insuffisants !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Vous n'avez pas d'aide-mémoire !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Vous ne pouvez pas faire ça maintenant !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Vous ne pouvez pas utiliser ce pouvoir avec ce type d'arme !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Vous portez trop de choses pour pouvoir faire ça !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9709,7 +9914,8 @@ msgstr "Echec de capture du familier."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+#, fuzzy
+msgid "Pet caught."
 msgstr "Familier capturé."
 
 #. TRANSLATORS: notification message
@@ -10267,12 +10473,12 @@ msgid "%d minutes"
 msgstr "%d minutes"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d secondes"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
diff --git a/po/id.po b/po/id.po
index 003c889e3..554f5a62f 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
@@ -41,21 +41,21 @@ msgstr "Data telah terunggah"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -71,35 +71,38 @@ msgid "Cache cleaned"
 msgstr "Cache dibersihkan"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klien hidup: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Sumber gambar:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Sumber gambar tak diketahui:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Variabel sekitar dibuang"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Mengunggah setelan ke:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Mengunggah setelan server ke:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Mengunggah catatan ke:"
 
@@ -135,6 +138,7 @@ msgstr "Nama organisasi hilang."
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Kembalikan pengalihan obrolan."
@@ -153,7 +157,8 @@ msgstr "Kembalikan pengalihan obrolan."
 msgid "Message now closes chat."
 msgstr "Pesan sekarang menutup obrolan."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -248,7 +253,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -262,8 +268,9 @@ msgstr "Abaikan permohonan transaksi"
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -277,6 +284,7 @@ msgstr "Terlihat di peta"
 msgid "Human"
 msgstr "Manusia"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "menghindar"
@@ -356,53 +364,53 @@ msgstr[0] "Kamu mengambil %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "pekerjaan"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Ikuti: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Tiruan: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Kamu lihat %s"
@@ -412,8 +420,8 @@ msgstr "Kamu lihat %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Sepenuhnya tolak"
 
@@ -438,9 +446,9 @@ msgid "Floating bubble"
 msgstr "Gelembung mengambang"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Pengaturan"
@@ -472,8 +480,9 @@ msgid "About"
 msgstr "Tentang"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Bantuan"
@@ -537,9 +546,12 @@ msgid "Changing game servers"
 msgstr "Mengganti server"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -550,7 +562,7 @@ msgstr "Mengganti server"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -743,32 +755,37 @@ msgstr "Update host tidak ada: %s."
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Kesalahan %s tidak ada dan tidak dapat dibuat! Keluar."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "pewarnacmd sumberdata pewarnastring datadst"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "atau"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "pewarnacmd sumberpewarnastring datadst"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1198,7 +1215,7 @@ msgstr "Pesan"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Hidupkan"
 
@@ -1218,10 +1235,11 @@ msgstr "Kamu membawa kurang dari separuh beratmu. Kamu bisa regenerasi darah."
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "dasar"
 
@@ -1382,8 +1400,8 @@ msgstr "Super besar (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(dasar)"
 
@@ -1714,14 +1732,14 @@ msgstr "Buat kelompok"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1773,13 +1791,17 @@ msgstr "Dagang"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Serang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1841,8 +1863,9 @@ msgstr "Jalan"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Berbicara"
 
@@ -1855,11 +1878,12 @@ msgstr "Berbicara"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Beli"
 
@@ -1872,11 +1896,12 @@ msgstr "Beli"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Jual"
 
@@ -1885,7 +1910,7 @@ msgstr "Jual"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Tambah komentar"
 
@@ -1911,7 +1936,7 @@ msgstr "Tambah ke daftar serangan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Tambah ke daftar abaikan"
 
@@ -1966,9 +1991,10 @@ msgstr "Lepaskan"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Ubah nama"
 
@@ -1994,8 +2020,8 @@ msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
@@ -2007,8 +2033,8 @@ msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Tambah ke obrolan"
 
@@ -2023,8 +2049,8 @@ msgstr "Item Peta"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Hapus"
 
@@ -2032,7 +2058,7 @@ msgstr "Hapus"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Jebakan"
 
@@ -2044,11 +2070,11 @@ msgstr "Gerakkan kamera"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Perlengkapan"
@@ -2060,8 +2086,8 @@ msgid "Clear outfit"
 msgstr "Bersihkan perlengkapan"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Mantra"
 
@@ -2127,8 +2153,8 @@ msgstr "Meninggalkan"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Salin ke papan"
 
@@ -2154,43 +2180,57 @@ msgstr "Buka"
 msgid "Lock"
 msgstr "Tutup"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta     "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Nama:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Komentar pemain           "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "komentar                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Tambah ke dagangan"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Tambah ke dagangan 10"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Tambah ke dagangan setengahnya"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Tambah ke dagangan semua-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Tambah semua ke dagangan"
 
@@ -2199,50 +2239,66 @@ msgstr "Tambah semua ke dagangan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Simpan"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Simpan 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Simpan setengah"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Simpan semua-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Simpan semua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Ambil"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Ambil semua-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
@@ -2250,58 +2306,59 @@ msgstr "Ambil semua"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Bersihkan jendela buang"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Sembunyi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Tampil"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Salin ke obrolan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2309,30 +2366,30 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Tanggalkan baju"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Salin"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Tempel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Buka tautan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Tampil jendela"
 
@@ -2340,7 +2397,7 @@ msgstr "Tampil jendela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2349,202 +2406,206 @@ msgstr "Tingkatan: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Daftar hitam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Set sebagai musuh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Berteman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Batal pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Ikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr "Gabung obrolan %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Perlihatkan Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Hapus dari daftar pungut"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Tambah ke daftar pungut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Batal proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Buang semua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "Komando GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "Cek ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Pergi ke"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Panggil balik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Keluarkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2555,17 +2616,17 @@ msgid "Basic"
 msgstr "Dasar"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Tombol cepat"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Jendela"
 
@@ -2579,9 +2640,10 @@ msgstr "Emosi"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Obrolan"
 
@@ -2593,9 +2655,9 @@ msgstr "Obrolan"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2682,10 +2744,12 @@ msgstr "Orang"
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Anggota kelompok"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Anggota organisasi"
@@ -2868,14 +2932,17 @@ msgstr "Batas tempat rumah"
 msgid "Road point"
 msgstr "Titik jalan"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Level: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2970,7 +3037,7 @@ msgstr "Ubah"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -2989,7 +3056,7 @@ msgstr "Tipe: %s"
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr "Tak diketahui"
 
@@ -3023,12 +3090,14 @@ msgstr "Jebakan target"
 msgid "Unknown:"
 msgstr "Tak diketahui:"
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr "Jarak: %d"
@@ -3539,7 +3608,8 @@ msgstr "Jendela"
 msgid "Auto hide chat window"
 msgstr "Otomatis sembunyi jendela obrolan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3547,11 +3617,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr "Proteksi fokus obrolan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3562,28 +3633,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Warna"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Hapus warna dari pesan obrolan yang masuk"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Tampil daftar warna obrolan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3593,31 +3666,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Perintah"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Perbolehkan magis dan Perintah GM di semua jendela obrolan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Batas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Batas maksimal karakter di garis obrolan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3627,11 +3702,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Batas maksimal baris di obrolan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3641,16 +3717,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Daftar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Perbolehkan riwayat obrolan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3658,31 +3735,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Aktifkan log debug obrolan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Tampil riwayat obrolan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr "Tampil pesan kelompok online"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3692,11 +3772,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Tampil pesan guild online"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3706,16 +3787,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Pesan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Sembunyi pesan toko"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3727,11 +3809,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Tampilkan pesan MVP"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3742,17 +3825,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Tab"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Masukkan semua bisikan kedalam tab"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3763,11 +3847,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Riwayat pesan sihir di jendela debug"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3776,11 +3861,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Tujukkan pesan server di jendela debug"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3790,11 +3876,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Perbolehkan jendela transkaksi/trade"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3803,11 +3890,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Aktifkan tab gm"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3817,11 +3905,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Aktifkan tab bahasa"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3830,11 +3919,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Tampilkan semua bahasa pesan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3844,11 +3934,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Perbolehkan jendela pertarungan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3858,11 +3949,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Tampil peristiwa pertarungan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3870,11 +3962,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Atur besar tab obrolan bila dibutuhkan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3885,27 +3978,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Waktu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Gunakan waktu lokal"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Sorot kata (dipisan dengan koma)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3914,11 +4009,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr "Nama abaikan global (dipisah dengan koma)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3927,11 +4023,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr "Tampil tombol emosi di obrolan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3942,16 +4039,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr "Tampil pesan modifikasi server di awal"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Warnanya terlihat seperti ini"
@@ -3963,7 +4062,7 @@ msgstr "Tipe:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Tunda:"
 
@@ -3984,33 +4083,33 @@ msgstr "Biru:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Statis"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Getar"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Pelangi"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -4217,9 +4316,10 @@ msgid "Cycle monster targets"
 msgstr "Tandai target monster"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4330,238 +4430,240 @@ msgstr ""
 msgid "Player"
 msgstr "Pemain"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Tampilkan hp bar sendiri"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Siklus target pemain"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Tampilkan pesan exp job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Tampilkan popup pemain"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Pesan saat meninggalkan keyboard"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Perlihatkan Job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Perbolehkan Penyaring Serangan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Toko"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Terima permintaan jual/beli"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Perbolehkan mode Jual"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Riwayat dialog NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4828,13 +4930,14 @@ msgstr "Perbolehkan penukaran"
 msgid "Allow whispers"
 msgstr "Perbolehkan berbisik"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4842,12 +4945,12 @@ msgid "Delete"
 msgstr "Hapus"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Ketika menolak:"
 
@@ -4917,30 +5020,31 @@ msgstr ""
 msgid "i"
 msgstr ""
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
@@ -5033,8 +5137,8 @@ msgstr "Batas FPS:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS: "
 
@@ -5064,63 +5168,66 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Tidak ada"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Mengubah ke mode Layar penuh"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Mengubah ke OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Masukkan resolusi baru:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Resolusi layar diubah"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5237,48 +5344,50 @@ msgstr ""
 msgid "max"
 msgstr "maksimal"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Detil partikel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5323,6 +5432,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr "Pengguna yang diajak %s ke organisasi %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5368,11 +5478,13 @@ msgstr ""
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Pengguna yang diajak %s ke kelompok."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5427,208 +5539,218 @@ msgstr ""
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr ""
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Stat membunuh"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Emotikon"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr ""
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Perlengkapan"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr ""
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Perbekalan"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr ""
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Keahlian"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "YK"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Apakah kamu tahu"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Kunci: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5658,7 +5780,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Buat"
 
@@ -5889,7 +6011,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Main"
@@ -5905,23 +6027,23 @@ msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5931,27 +6053,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Sandi tidak benar"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Masukan Sandi untuk menghapus karakter"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Masukkan sandi:"
 
@@ -5973,7 +6096,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6136,12 +6260,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6372,8 +6496,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6408,7 +6533,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6432,6 +6558,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
@@ -6471,6 +6598,7 @@ msgstr ""
 msgid "status bar"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr ""
@@ -6679,13 +6807,14 @@ msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Toko personal"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6704,23 +6833,46 @@ msgstr "Perlihatkan link di Umumkan"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s ingin %s %s apakah anda bersedia?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s ingin %s %s apakah anda bersedia?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s ingin %s %s apakah anda bersedia?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6731,36 +6883,37 @@ msgid "Up"
 msgstr "Naik"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6864,21 +7017,23 @@ msgstr ""
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr ""
 
@@ -7053,27 +7208,28 @@ msgstr "Mengupdate..."
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr ""
 
@@ -8525,284 +8681,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8835,103 +9026,116 @@ msgstr ""
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, c-format
+msgid "hungry level %d"
+msgstr ""
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Anda tidak dapat melakukannya sekarang!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9639,7 +9843,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10185,12 +10389,12 @@ msgid "%d minutes"
 msgstr "%d menit"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d detik"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
diff --git a/po/it.po b/po/it.po
index a57b52cf2..d4dc1820b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
@@ -46,21 +46,21 @@ msgstr "File caricato"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -76,35 +76,38 @@ msgid "Cache cleaned"
 msgstr "Cache puliti"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tempo online: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Risorsa immagine:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Risorsa immagine orfana:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Variabile d'ambiente dumping"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Carica configurazione in:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Carica configurazione server in:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Carica log in:"
 
@@ -140,6 +143,7 @@ msgstr "Manca il nome della gilda."
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Attiva/disattiva la chat."
@@ -158,7 +162,8 @@ msgstr "Attiva/disattiva la chat adesso."
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la chat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -253,7 +258,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -267,8 +273,9 @@ msgstr "Le richieste di scambio in arrivo saranno ignorate"
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -282,6 +289,7 @@ msgstr "Visibile nella mappa"
 msgid "Human"
 msgstr "Umano"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "Schivato"
@@ -362,53 +370,53 @@ msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "EXP"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Modalità Segui cancellata"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Modalità Imitazione cancellata"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -418,8 +426,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
@@ -444,9 +452,9 @@ msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Impostazioni"
@@ -478,8 +486,9 @@ msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aiuto"
@@ -543,9 +552,12 @@ msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -556,7 +568,7 @@ msgstr "Cambiamento server del gioco"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -752,32 +764,37 @@ msgstr ""
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1207,7 +1224,7 @@ msgstr "Messaggio"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr ""
 
@@ -1229,10 +1246,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "Predefinito"
 
@@ -1393,8 +1411,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(default)"
 
@@ -1725,14 +1743,14 @@ msgstr "Crea gruppo"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1784,13 +1802,17 @@ msgstr "Commercia"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Attacco"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1852,8 +1874,9 @@ msgstr "Movimento"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Parla"
 
@@ -1866,11 +1889,12 @@ msgstr "Parla"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Compra"
 
@@ -1883,11 +1907,12 @@ msgstr "Compra"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vendi"
 
@@ -1896,7 +1921,7 @@ msgstr "Vendi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
@@ -1922,7 +1947,7 @@ msgstr "Aggiungi alla lista Attacco"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
@@ -1977,9 +2002,10 @@ msgstr "Togli"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -2005,8 +2031,8 @@ msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
@@ -2018,8 +2044,8 @@ msgstr "Raccogli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
@@ -2034,8 +2060,8 @@ msgstr "Oggetto mappa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -2043,7 +2069,7 @@ msgstr "Rimuovi"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Teletrasporto"
 
@@ -2055,11 +2081,11 @@ msgstr "Muovi telecamera"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Attrezzatura"
@@ -2071,8 +2097,8 @@ msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
@@ -2138,8 +2164,8 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
@@ -2165,43 +2191,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Rinomina mappa           "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Commento giocatore:       "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Commento:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Aggiungi 10"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Aggiungi metà"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Aggiungi tutti"
 
@@ -2210,50 +2250,66 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Magazzino"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Salva 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Salva metà"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Salva tutto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
@@ -2261,58 +2317,59 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Reset barra gialla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copia in Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -2320,30 +2377,30 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Mostra Finestra"
 
@@ -2351,7 +2408,7 @@ msgstr "Mostra Finestra"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2360,202 +2417,206 @@ msgstr "Livello: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Invita nel party"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Lascia tutto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Caccia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2566,17 +2627,17 @@ msgid "Basic"
 msgstr "Base"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Finestre"
 
@@ -2590,9 +2651,10 @@ msgstr "Faccine"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
@@ -2604,9 +2666,9 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2693,10 +2755,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
@@ -2879,14 +2943,17 @@ msgstr ""
 msgid "Road point"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2981,7 +3048,7 @@ msgstr "Modifica"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3000,7 +3067,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3034,12 +3101,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3550,7 +3619,8 @@ msgstr "Finestra"
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3558,11 +3628,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3573,28 +3644,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Colori"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Rimuovi colori dei messaggi ricevuti in chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Mostra colori per la chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3604,31 +3677,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Comandi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Autorizza i comandi delle magie e dei GM per tutte le tabelle di chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Limiti"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Limita un massimo di caratteri per messaggio"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3638,11 +3713,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Limita un massimo di messaggi per la chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3652,16 +3728,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Logs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Abilita I logs della chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3669,31 +3746,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Mostra la storia della chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3703,11 +3783,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3717,16 +3798,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Messaggi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Nascondi i messaggi del negozio"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3738,11 +3820,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3753,17 +3836,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Tabs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Sposta tutti i sussurri in schede"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3774,11 +3858,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Salva i messaggi delle magie nella debug tab"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3787,11 +3872,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Mostra i messaggi del server nella chat di debug"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3801,11 +3887,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Abilita la chat di commercio"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3814,11 +3901,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3828,11 +3916,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3841,11 +3930,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3855,11 +3945,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Abilita la chat di battaglia"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3869,11 +3960,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Mostra gli eventi della battaglia"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3881,11 +3973,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Dimensione finestra dialogo dinamica"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3896,27 +3989,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Tempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Usa ora locale"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3925,11 +4020,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3938,11 +4034,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3953,16 +4050,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Come appaiono i colori"
@@ -3974,7 +4073,7 @@ msgstr "Type:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Ritardo:"
 
@@ -3995,33 +4094,33 @@ msgstr "Blu:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Statico"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Pulsazione"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Arcobaleno"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Gamma"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -4230,9 +4329,10 @@ msgid "Cycle monster targets"
 msgstr "Ciclo di target sui nemici"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4343,238 +4443,240 @@ msgstr ""
 msgid "Player"
 msgstr "Giocatore"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Mostra la barra HP giocatore"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Abilita statistiche veloci"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Ciclo di target sui giocatori"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Mostra messaggi riguardo all'esperienza - punti lavoro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Visualizza messaggi popup"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Mostra barra lavoro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Attiva filtro attacchi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Attiva filtro 'Raccogli'"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Negozio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Accetta richieste di vendita/acquisto"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Abilita la modalità negozio"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Log dialoghi NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Tastiera"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Server Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Tipologia Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Proxy indirizzo:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Attiva attacchi server-side"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Abilita il bot checker"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Abilita i log di debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Attiva registro attivita' OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Modalità basso traffico"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Usa FBO, Frame Buffer Object (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Mostra sfondo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4841,13 +4943,14 @@ msgstr "Permetti scambi"
 msgid "Allow whispers"
 msgstr "Permetti sussurri"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4855,12 +4958,12 @@ msgid "Delete"
 msgstr "Elimina"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Relazioni"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Quando si ignora:"
 
@@ -4930,30 +5033,31 @@ msgstr ""
 msgid "i"
 msgstr ""
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Informazioni sul tema"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Tema cambiato"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
@@ -5046,8 +5150,8 @@ msgstr "Limite FPS:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Limite Alt FPS: "
 
@@ -5077,16 +5181,18 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Nessuno"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5094,7 +5200,7 @@ msgstr ""
 "precedente è fallito!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5102,42 +5208,43 @@ msgstr ""
 "modalità precedente è fallito!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Cambiamento a schermo intero"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Passa a OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Riavvia per passare a OpenGL."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Risoluzione scelta (esempio 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Nuova risoluzione:                   "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "RIsoluzione schermo cambiata"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
@@ -5256,48 +5363,50 @@ msgstr "Suoni ambientali"
 msgid "max"
 msgstr "massimo"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Dettaglio particelle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Fisica Particle"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Abilita controllo gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Centra la finestra di gioco"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Permetti allo screensaver di attivarsi"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5342,6 +5451,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr "Invitato utente %s alla gilda %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5387,11 +5497,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Invitato utente al gruppo %s."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5446,208 +5558,218 @@ msgstr ""
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Chi è online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Missioni"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "KS"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Statistiche uccisioni"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Faccine"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Stato"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EQU"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventario"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Carrello"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "SKI"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Abilità"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Sociale"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Suggerimenti"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Chiave: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5677,7 +5799,7 @@ msgstr "Quantita':"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crea"
 
@@ -5908,7 +6030,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Gioca"
@@ -5924,23 +6046,23 @@ msgid "Info"
 msgstr "Informazioni"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5950,27 +6072,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Password non valida"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Digitare password per eliminare un personaggio"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Digitare password:"
 
@@ -5992,7 +6115,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6155,12 +6279,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6393,8 +6517,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6429,7 +6554,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6453,6 +6579,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Barra HP"
@@ -6492,6 +6619,7 @@ msgstr "barra frecce"
 msgid "status bar"
 msgstr "Barra dello stato"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "Barra dei punti lavoro"
@@ -6700,13 +6828,14 @@ msgid "Reset Windows"
 msgstr "Resetta finestre"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Negozio personale"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6725,23 +6854,46 @@ msgstr "Mostra link nell'annuncio"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s vuole %s %s accetti?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s vuole %s %s accetti?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s vuole %s %s accetti?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6752,36 +6904,37 @@ msgid "Up"
 msgstr "Su"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Abilità impostata %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Abilità %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6885,21 +7038,23 @@ msgstr "%s ti ha invitato ad unirti al suo party."
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossibile creare un party, sei già in un party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Nome del gruppo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party."
 
@@ -7076,27 +7231,28 @@ msgstr "Aggiornamento..."
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  riprova più tardi."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Completato"
 
@@ -8552,284 +8708,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr "Eliminazione personaggio fallita."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Disconnesso dal server!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Forza"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Agilità"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitalità"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Intelligenza"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Destrezza"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Fortuna"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Difesa."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "Attacco magico."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "Difesa Magica."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuratezza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasione"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Colpo critico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Ritardo Attacco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Ritardo Movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Range d'attacco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Danno per secondo."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Nessun server disponibile."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Qualcun altro sta provando ad usare questo account."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Questo account è già registrato."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Rilevato speed hack."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Accesso duplicato."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Errore di connessione sconosciuto."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8862,103 +9053,116 @@ msgstr "La vecchia password è sbagliata."
 msgid "New password too short."
 msgstr "La nuova password è troppo corta."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Livello Gilda: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Non hai raggiunto un Livello sufficientemente alto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP insufficienti!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP Insufficienti!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Non hai nessun promemoria!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Al momento non puoi farlo!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Sembra tu abbia bisogno di più soldi... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Non puoi usare questa Abilità con questa arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Hai bisogno un'altra Gemma Rossa!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Hai bisogno un'altra Gemma Blu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Stai trasportando troppo carico per compiere quest'azione!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9666,7 +9870,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10213,12 +10417,12 @@ msgid "%d minutes"
 msgstr "%d minuti"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d secondi"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
diff --git a/po/ja.po b/po/ja.po
index 50a0ef6a8..e4841f384 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2016-01-03 17:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
@@ -42,21 +42,21 @@ msgstr ""
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -72,35 +72,38 @@ msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -135,6 +138,7 @@ msgstr "ギルド名がありません."
 msgid "Please specify a name."
 msgstr "名前を入力してください."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "改行キーでチャット入力ができます."
@@ -153,7 +157,8 @@ msgstr "改行キーでチャット入力ができます."
 msgid "Message now closes chat."
 msgstr "チャットを閉じます."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -248,7 +253,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -262,8 +268,9 @@ msgstr "トレードリクエストを無効にしています"
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -277,6 +284,7 @@ msgstr "マップに表示させる"
 msgid "Human"
 msgstr "人間"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "ドッジ"
@@ -356,53 +364,53 @@ msgstr[0] "%d [@@%d|%s@@]を手に入れました."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "ジョブ"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -412,8 +420,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -438,9 +446,9 @@ msgid "Floating bubble"
 msgstr "吹出し"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "設定"
@@ -472,8 +480,9 @@ msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "ヘルプ"
@@ -537,9 +546,12 @@ msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -550,7 +562,7 @@ msgstr "ゲームサーバーを変更しています"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -746,32 +758,37 @@ msgstr ""
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラ!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "デバッグ"
@@ -1201,7 +1218,7 @@ msgstr "メッセージ"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr ""
 
@@ -1220,10 +1237,11 @@ msgstr "インベントリーが体重の半分以下になった為、体力は
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "デフォルト"
 
@@ -1384,8 +1402,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1716,14 +1734,14 @@ msgstr "パーティを作る"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1775,13 +1793,17 @@ msgstr "トレード"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "攻撃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1843,8 +1865,9 @@ msgstr "動く"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "話す"
 
@@ -1857,11 +1880,12 @@ msgstr "話す"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "買う"
 
@@ -1874,11 +1898,12 @@ msgstr "買う"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "売る"
 
@@ -1887,7 +1912,7 @@ msgstr "売る"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "コメントをする"
 
@@ -1913,7 +1938,7 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
@@ -1968,9 +1993,10 @@ msgstr "取外す"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "名前を変更する"
 
@@ -1996,8 +2022,8 @@ msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
@@ -2009,8 +2035,8 @@ msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "チャットに追加"
 
@@ -2025,8 +2051,8 @@ msgstr "マップアイテム"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "削除"
 
@@ -2034,7 +2060,7 @@ msgstr "削除"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "ワープ"
 
@@ -2046,11 +2072,11 @@ msgstr "カメラを動かす"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "服装"
@@ -2062,8 +2088,8 @@ msgid "Clear outfit"
 msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "呪文"
 
@@ -2129,8 +2155,8 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
@@ -2156,43 +2182,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "マップサインの名前を変更 "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "名前:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "プレイヤーコメント        "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "コメント:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
@@ -2201,50 +2241,66 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "保管"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "10 保存"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "半分保存"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "全部保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "取出す"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "半分取出す"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "全部取出す"
 
@@ -2252,58 +2308,59 @@ msgstr "全部取出す"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2311,30 +2368,30 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr ""
 
@@ -2342,7 +2399,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2351,202 +2408,206 @@ msgstr "レベル: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "全て落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2557,17 +2618,17 @@ msgid "Basic"
 msgstr "基本"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "ショートカット"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "ウィンドウ"
 
@@ -2581,9 +2642,10 @@ msgstr "スマイリー"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "チャット"
 
@@ -2595,9 +2657,9 @@ msgstr "チャット"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2684,10 +2746,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
@@ -2870,14 +2934,17 @@ msgstr ""
 msgid "Road point"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2972,7 +3039,7 @@ msgstr "編集"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -2991,7 +3058,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3025,12 +3092,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3541,7 +3610,8 @@ msgstr "ウィンドウ"
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3549,11 +3619,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3564,28 +3635,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "色"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "受信したメッセージの色を無効にする"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "チャットの文字色リストを表示"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3595,31 +3668,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "コマンド"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "全てのタブで呪文とGMコマンドをログする"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "制限"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "チャットで一行に表示する最大文字数を制限する"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3629,11 +3704,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "チャットで表示する最大行数を制限する"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3643,16 +3719,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "ログ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "チャットログを有効"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3660,31 +3737,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "チャット履歴を表示"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3694,11 +3774,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3708,16 +3789,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "メッセージ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "売買メッセージを隠す"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3729,11 +3811,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "MVPメッセージを表示する"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3744,17 +3827,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "タブ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "ささやきををタブで表示する"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3765,11 +3849,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "デバッグタブに呪文をログする"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3778,11 +3863,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "デバッグタブにサーバーメッセージをログする"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3792,11 +3878,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "トレードタブを有効"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3805,11 +3892,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3819,11 +3907,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3832,11 +3921,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3846,11 +3936,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "バトルタブを有効"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3860,11 +3951,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "バトルイベントを表示"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3872,11 +3964,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "チャットタブをリサイズする"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3887,27 +3980,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "時間"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "ローカルタイムを使う"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "文字をハイライト (コンマで区切る)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3916,11 +4011,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3929,11 +4025,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3944,16 +4041,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "色の例"
@@ -3965,7 +4064,7 @@ msgstr "タイプ:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "遅延:"
 
@@ -3986,33 +4085,33 @@ msgstr "青:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "穏やか"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "点滅"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "カラフル"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "スペクトル"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "アルファ:"
 
@@ -4221,9 +4320,10 @@ msgid "Cycle monster targets"
 msgstr "選択したモンスターを円で表示"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4334,238 +4434,240 @@ msgstr ""
 msgid "Player"
 msgstr "プレイヤー"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "自分のHPバーを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "クイックスタッツを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "選択したプレイヤーを円で表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "ジョブExpメッセージを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "プレイヤーポップアップを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "AFKメッセージ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "ジョブを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "攻撃フィルターを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "アドバートプロトコルを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "店"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "売買リクエストを受け入れる"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "ショップモードを有効にする"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "NPCターゲットを回転"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "NPCダイアログを記録する"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "ボットサポート"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr "ギルドサポートを無効にしギルドボットを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "ショートカットボタン"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "プロキシサーバー"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "プロキシタイプ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "プロキシアドレス:ポート"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "サーバーサイドアタックを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "ボットチェッカーを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "不安定なサーバー保護を有効にする(無効にしない)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "デバッグログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "OpenGLログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "入力ログを有効にする"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "低トラフィックモード"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "スクリーンショットにFBOを使う (OpenGLのみ)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "背景を表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4832,13 +4934,14 @@ msgstr "トレードを受付ける"
 msgid "Allow whispers"
 msgstr "全てのささやきを受け取る"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4846,12 +4949,12 @@ msgid "Delete"
 msgstr "削除"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "関係"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "完全無視の際には:"
 
@@ -4921,30 +5024,31 @@ msgstr ""
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "テーマ情報"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "テーマを変更しました"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更の為アプリケーションを再起動してください."
 
@@ -5037,8 +5141,8 @@ msgstr "FPSリミット:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Alt FPS リミット: "
 
@@ -5068,63 +5172,66 @@ msgid "No frame"
 msgstr "フレームなし"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "なし"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "ウインドウモード、また前モードの復元にも失敗しました!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "フルスクリーンモード、また前モードの復元にも失敗しました!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "フルスクリーンに変更"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更の為、再起動をしてください."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "OpenGLに変更"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGLの設定を変更するため、再起動をしてください."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "カスタム解像度 (例: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "解像度を入力して下さい:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "スクリーンの解像度を変更しました"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります."
 
@@ -5241,48 +5348,50 @@ msgstr "環境FX"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "パーティクルの詳細"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "パーティクルフィジックス"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "ガンマ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "ガンマコントロールを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vシンク"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "スクリーンセーバーを有効にする"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5327,6 +5436,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr "ユーザー %sを、ギルド %sに招待しました."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5372,11 +5482,13 @@ msgstr "ナビ"
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "ユーザー %s をパーティに招待しました."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5431,208 +5543,218 @@ msgstr ""
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "オンラインリスト"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "ヘルプ"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "QE"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "クエスト"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "KS"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "キル統計"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "スマイリー"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "ステータス"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EQU"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "装着品"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "インベントリー"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "カート"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "地図"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "SKI"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "スキル"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "ソーシャル"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "YK"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "豆知識"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "鍵: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5662,7 +5784,7 @@ msgstr "量:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "作成"
 
@@ -5893,7 +6015,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "プレイ"
@@ -5909,23 +6031,23 @@ msgid "Info"
 msgstr "情報"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5935,27 +6057,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "パスワードが違います"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "キャラクターを削除するにはパスワードを入力して下さい"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
@@ -5977,7 +6100,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6140,12 +6264,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6376,8 +6500,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6412,7 +6537,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6436,6 +6562,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "健康"
@@ -6475,6 +6602,7 @@ msgstr "矢"
 msgid "status bar"
 msgstr "情勢"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "職"
@@ -6683,13 +6811,14 @@ msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "最大 (15)"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6708,23 +6837,46 @@ msgstr "アナウンスにリンクを表示する"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%sが%s %sを希望しています。承認しますか?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%sが%s %sを希望しています。承認しますか?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%sが%s %sを希望しています。承認しますか?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6735,36 +6887,37 @@ msgid "Up"
 msgstr "上"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6868,21 +7021,23 @@ msgstr "%sはあなたをパーティに招待しました."
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "パーティ名"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください."
 
@@ -7059,27 +7214,28 @@ msgstr "更新しています..."
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 する事を強く推奨します"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  しばらくたってからもう一度試してください."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "完了"
 
@@ -8535,284 +8691,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断されました!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "攻撃力"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "機敏さ"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "防御力"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "魔力"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "命中率"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "攻撃遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "徒歩遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "攻撃距離"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "ダメージ/秒."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "認証に失敗しました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "利用できるサーバーがありません."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "他からのログインがありました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "このアカウントは既にログイン中です."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "スピードハックが探知されました."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "重複ログイン."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "不明な接続エラーです."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8845,103 +9036,116 @@ msgstr "変更前のパスワードが間違っています."
 msgid "New password too short."
 msgstr "新しいパスワードは文字数が足りません."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "ギルドレベル: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "あなたはまだ十分なlvlに達していません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "メモがありません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "今この行動はできません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "GPが足りません... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "このスキルはこの武器と一緒に使えません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Red Gemが必要です!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Blue Gemが必要です!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "アイテムを持ちすぎています!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9649,7 +9853,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10196,12 +10400,12 @@ msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d秒"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index ae22eecc7..64640883d 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,21 +35,21 @@ msgstr ""
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -65,35 +65,38 @@ msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -128,6 +131,7 @@ msgstr ""
 msgid "Please specify a name."
 msgstr ""
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr ""
@@ -146,7 +150,8 @@ msgstr ""
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -241,7 +246,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -255,8 +261,9 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -270,6 +277,7 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr ""
@@ -350,53 +358,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -406,8 +414,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr ""
 
@@ -432,9 +440,9 @@ msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr ""
@@ -466,8 +474,9 @@ msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -531,9 +540,12 @@ msgid "Changing game servers"
 msgstr ""
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -544,7 +556,7 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -737,32 +749,37 @@ msgstr ""
 msgid "Error creating updates directory!"
 msgstr ""
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
@@ -1192,7 +1209,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr ""
 
@@ -1211,10 +1228,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr ""
 
@@ -1375,8 +1393,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1707,14 +1725,14 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1766,13 +1784,17 @@ msgstr ""
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1834,8 +1856,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr ""
 
@@ -1848,11 +1871,12 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr ""
 
@@ -1865,11 +1889,12 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr ""
 
@@ -1878,7 +1903,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr ""
 
@@ -1904,7 +1929,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1959,9 +1984,10 @@ msgstr ""
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr ""
 
@@ -1987,8 +2013,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr ""
 
@@ -2000,8 +2026,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr ""
 
@@ -2016,8 +2042,8 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr ""
 
@@ -2025,7 +2051,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
@@ -2037,11 +2063,11 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr ""
@@ -2053,8 +2079,8 @@ msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr ""
 
@@ -2120,8 +2146,8 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2147,43 +2173,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr ""
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr ""
 
@@ -2192,50 +2232,66 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr ""
 
@@ -2243,58 +2299,59 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr ""
 
@@ -2302,30 +2359,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr ""
 
@@ -2333,7 +2390,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2342,202 +2399,206 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2548,17 +2609,17 @@ msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2572,9 +2633,10 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr ""
 
@@ -2586,9 +2648,9 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2675,10 +2737,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
@@ -2861,14 +2925,17 @@ msgstr ""
 msgid "Road point"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2963,7 +3030,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2982,7 +3049,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3016,12 +3083,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3532,7 +3601,8 @@ msgstr ""
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3540,11 +3610,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3555,28 +3626,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3586,31 +3659,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3620,11 +3695,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3634,16 +3710,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3651,31 +3728,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3685,11 +3765,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3699,16 +3780,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3720,11 +3802,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3735,17 +3818,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3756,11 +3840,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3769,11 +3854,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3783,11 +3869,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3796,11 +3883,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3810,11 +3898,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3823,11 +3912,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3837,11 +3927,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3851,11 +3942,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3863,11 +3955,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3878,27 +3971,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3907,11 +4002,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3920,11 +4016,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3935,16 +4032,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr ""
@@ -3956,7 +4055,7 @@ msgstr ""
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr ""
 
@@ -3977,33 +4076,33 @@ msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr ""
 
@@ -4210,9 +4309,10 @@ msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4323,238 +4423,240 @@ msgstr ""
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4821,13 +4923,14 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4835,12 +4938,12 @@ msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr ""
 
@@ -4910,30 +5013,31 @@ msgstr ""
 msgid "i"
 msgstr ""
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -5026,8 +5130,8 @@ msgstr ""
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -5057,63 +5161,66 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5230,48 +5337,50 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5316,6 +5425,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5361,11 +5471,13 @@ msgstr ""
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5420,208 +5532,218 @@ msgstr ""
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr ""
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr ""
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr ""
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr ""
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5651,7 +5773,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
 
@@ -5882,7 +6004,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5898,23 +6020,23 @@ msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5924,27 +6046,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr ""
 
@@ -5966,7 +6089,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6129,12 +6253,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6367,8 +6491,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6403,7 +6528,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6427,6 +6553,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
@@ -6466,6 +6593,7 @@ msgstr ""
 msgid "status bar"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr ""
@@ -6674,13 +6802,14 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6699,23 +6828,46 @@ msgstr ""
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
-#. TRANSLATORS: shop window dialog
-#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
-msgid "Request for Trade"
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
 #: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr ""
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
 #, c-format
-msgid "%s wants to %s %s do you accept?"
+msgid "%s wants to sell %s do you accept?"
+msgstr ""
+
+#. TRANSLATORS: shop window dialog
+#. TRANSLATORS: trade message
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6726,36 +6878,37 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6859,21 +7012,23 @@ msgstr ""
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr ""
 
@@ -7048,27 +7203,28 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr ""
 
@@ -8520,284 +8676,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8830,103 +9021,116 @@ msgstr ""
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, c-format
+msgid "hungry level %d"
+msgstr ""
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9634,7 +9838,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10179,12 +10383,12 @@ msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 93711ee6b..2a70329a2 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2016-01-03 17:03+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -39,21 +39,21 @@ msgstr "Bestand is opgeladen"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -69,35 +69,38 @@ msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
@@ -132,6 +135,7 @@ msgstr "Guild-naam ontbreekt."
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat."
@@ -150,7 +154,8 @@ msgstr "Ga nu terug naar chat."
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -245,7 +250,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -259,8 +265,9 @@ msgstr "Inkomende handelsaanvragen negeren"
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -274,6 +281,7 @@ msgstr "Zichtbaar op de map"
 msgid "Human"
 msgstr "Mens"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "ontwijkt"
@@ -354,53 +362,53 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "ep"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Volg %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiteer %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "You see %s"
@@ -410,8 +418,8 @@ msgstr "You see %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -436,9 +444,9 @@ msgid "Floating bubble"
 msgstr "Zwevende bel"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configureren"
@@ -470,8 +478,9 @@ msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -535,9 +544,12 @@ msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -548,7 +560,7 @@ msgstr "Wijzigen spelservers"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -741,32 +753,37 @@ msgstr "Ongeldige opwaarderingshost %s."
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "of"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1196,7 +1213,7 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr ""
 
@@ -1217,10 +1234,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "standaard"
 
@@ -1381,8 +1399,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1713,14 +1731,14 @@ msgstr "Groep aanmaken"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1772,13 +1790,17 @@ msgstr "Handel"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Aanvallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1840,8 +1862,9 @@ msgstr "Beweeg"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Spreken"
 
@@ -1854,11 +1877,12 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1871,11 +1895,12 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -1884,7 +1909,7 @@ msgstr "Verkopen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr ""
 
@@ -1910,7 +1935,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -1965,9 +1990,10 @@ msgstr "Afdoen"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -1993,8 +2019,8 @@ msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
@@ -2006,8 +2032,8 @@ msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
@@ -2022,8 +2048,8 @@ msgstr "Plaats voorwerp op de kaart"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -2031,7 +2057,7 @@ msgstr "Verwijder"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
@@ -2043,11 +2069,11 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Kleren"
@@ -2059,8 +2085,8 @@ msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spreuken"
 
@@ -2126,8 +2152,8 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2153,43 +2179,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Naam:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr ""
 
@@ -2198,50 +2238,66 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Plaats 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Plaats de helft"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2249,58 +2305,59 @@ msgstr "Haal alles op"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2308,30 +2365,30 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr ""
 
@@ -2339,7 +2396,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2348,202 +2405,206 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2554,17 +2615,17 @@ msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2578,9 +2639,10 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
@@ -2592,9 +2654,9 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2681,10 +2743,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Groep leden"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Guild leden"
@@ -2867,14 +2931,17 @@ msgstr "Thuisplaatsgrens"
 msgid "Road point"
 msgstr "Wegpunt"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2969,7 +3036,7 @@ msgstr "Wijzig"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
@@ -2988,7 +3055,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3022,12 +3089,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3538,7 +3607,8 @@ msgstr ""
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3546,11 +3616,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3561,28 +3632,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Kleuren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Verwijder kleuren van ontvangen chat berichten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Toon chat kleurenlijst"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3592,31 +3665,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Commando's"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Magie en GM commandos toe in alle chat tabs"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Limieten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Limiteer max karakters in chat lijn"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3626,11 +3701,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Limiteer max lijnen in chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3640,16 +3716,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Logs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Zet chat log aan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3657,31 +3734,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Toon chat geschiedenis"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3691,11 +3771,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3705,16 +3786,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Berichten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Verberg verkoop boodschappen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3726,11 +3808,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3741,17 +3824,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Plaats alle persoonlijke berichten in tabs"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3762,11 +3846,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Hou magie berichten bij in de 'Debug' tab"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3775,11 +3860,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Toon server berichten in de debug tab"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3789,11 +3875,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Zet handle tab aan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3802,11 +3889,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3816,11 +3904,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Taal tab aanzetten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3829,11 +3918,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Toon alle taal berichten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3843,11 +3933,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Schakel de gevechtstab in"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3857,11 +3948,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "geef de gevechtsevenementen weer"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3869,11 +3961,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3884,27 +3977,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Tijd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Gebruik lokale tijd"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3913,11 +4008,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3926,11 +4022,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3941,16 +4038,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
@@ -3962,7 +4061,7 @@ msgstr "Type:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Vertraging:"
 
@@ -3983,33 +4082,33 @@ msgstr "Blauw:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Statisch"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Regenboog"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Spectrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -4216,9 +4315,10 @@ msgid "Cycle monster targets"
 msgstr "Doorloop monsterdoelwitten"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4329,238 +4429,240 @@ msgstr ""
 msgid "Player"
 msgstr "Speler"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Toon hp statusbalk van jezelf"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Zet snelle statistieken aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Doorloop spelerdoelwitten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Geef de job ervarings berichten weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Geef de spelers popups weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "'Weg van het toetsenbord'-bericht"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Geef je beroep weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Winkel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Accepteer koop/verkoop aanvragen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "shop modus aanzetten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Houd de NPC dialogen bij"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Aanval gecontroleerd door server aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Bot controle aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Laag verkeer modus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Toon achtergrond"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4827,13 +4929,14 @@ msgstr "Handelen toestaan"
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4841,12 +4944,12 @@ msgid "Delete"
 msgstr "Verwijderen"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Relaties"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
@@ -4916,30 +5019,31 @@ msgstr ""
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Thema info"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Thema is gewijzigd"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -5032,8 +5136,8 @@ msgstr "FPS limiet:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Alt FPS limiet: "
 
@@ -5063,16 +5167,18 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Geen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5080,7 +5186,7 @@ msgstr ""
 "faalde ook!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5088,42 +5194,43 @@ msgstr ""
 "modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:           "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
@@ -5242,48 +5349,50 @@ msgstr "Omgevingseffecten"
 msgid "max"
 msgstr "max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Deeltjesdetail"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5328,6 +5437,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr "gebruiker %s uitgenodigd in guild %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5373,11 +5483,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gebruiker %s uitgenodigd in groep."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5432,208 +5544,218 @@ msgstr ""
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Wie is online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "KS"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "UITR"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventaris"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Winkelkar"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "VAAR"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Vaardigheden"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Sociaal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "NL"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "WU"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Weet u"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "WINKEL"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "KL"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "CONF"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Toets: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5663,7 +5785,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -5894,7 +6016,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Spelen"
@@ -5910,23 +6032,23 @@ msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5936,27 +6058,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
@@ -5978,7 +6101,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6141,12 +6265,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6379,8 +6503,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6415,7 +6540,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6439,6 +6565,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
@@ -6478,6 +6605,7 @@ msgstr ""
 msgid "status bar"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr ""
@@ -6686,13 +6814,14 @@ msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6711,23 +6840,46 @@ msgstr "Toon links in aankondigingen"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s wilt %s %s ga je akkoord?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s wilt %s %s ga je akkoord?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s wilt %s %s ga je akkoord?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6738,36 +6890,37 @@ msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6871,21 +7024,23 @@ msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Groep Naam"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -7062,27 +7217,28 @@ msgstr "Actualiseren..."
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -8538,284 +8694,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Kracht"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Behendigheid"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitaliteit"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Intelligentie"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Handigheid"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Geluk"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "M.Aanval"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "M.Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ontwijking"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Aanvalsvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Wandelvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Aanvalsbereik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Authenticatie gefaald."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Geen servers beschikbaar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Deze account is al ingelogd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Snelheidshack gedetecteerd."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Verdubbelde login."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Onbekende connectiefout."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8848,103 +9039,116 @@ msgstr "Oud wachtwoord is ongeldig."
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, c-format
+msgid "hungry level %d"
+msgstr ""
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9653,7 +9857,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10199,12 +10403,12 @@ msgid "%d minutes"
 msgstr "%d minuten"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d seconden"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 93711ee6b..2a70329a2 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2016-01-03 17:03+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -39,21 +39,21 @@ msgstr "Bestand is opgeladen"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -69,35 +69,38 @@ msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
@@ -132,6 +135,7 @@ msgstr "Guild-naam ontbreekt."
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat."
@@ -150,7 +154,8 @@ msgstr "Ga nu terug naar chat."
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -245,7 +250,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -259,8 +265,9 @@ msgstr "Inkomende handelsaanvragen negeren"
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -274,6 +281,7 @@ msgstr "Zichtbaar op de map"
 msgid "Human"
 msgstr "Mens"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "ontwijkt"
@@ -354,53 +362,53 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "ep"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Volg %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiteer %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "You see %s"
@@ -410,8 +418,8 @@ msgstr "You see %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -436,9 +444,9 @@ msgid "Floating bubble"
 msgstr "Zwevende bel"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configureren"
@@ -470,8 +478,9 @@ msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -535,9 +544,12 @@ msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -548,7 +560,7 @@ msgstr "Wijzigen spelservers"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -741,32 +753,37 @@ msgstr "Ongeldige opwaarderingshost %s."
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "of"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1196,7 +1213,7 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr ""
 
@@ -1217,10 +1234,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "standaard"
 
@@ -1381,8 +1399,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1713,14 +1731,14 @@ msgstr "Groep aanmaken"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1772,13 +1790,17 @@ msgstr "Handel"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Aanvallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1840,8 +1862,9 @@ msgstr "Beweeg"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Spreken"
 
@@ -1854,11 +1877,12 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1871,11 +1895,12 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -1884,7 +1909,7 @@ msgstr "Verkopen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr ""
 
@@ -1910,7 +1935,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -1965,9 +1990,10 @@ msgstr "Afdoen"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -1993,8 +2019,8 @@ msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
@@ -2006,8 +2032,8 @@ msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
@@ -2022,8 +2048,8 @@ msgstr "Plaats voorwerp op de kaart"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -2031,7 +2057,7 @@ msgstr "Verwijder"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
@@ -2043,11 +2069,11 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Kleren"
@@ -2059,8 +2085,8 @@ msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spreuken"
 
@@ -2126,8 +2152,8 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2153,43 +2179,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Naam:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr ""
 
@@ -2198,50 +2238,66 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Plaats 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Plaats de helft"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2249,58 +2305,59 @@ msgstr "Haal alles op"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2308,30 +2365,30 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr ""
 
@@ -2339,7 +2396,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2348,202 +2405,206 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2554,17 +2615,17 @@ msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2578,9 +2639,10 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
@@ -2592,9 +2654,9 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2681,10 +2743,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Groep leden"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Guild leden"
@@ -2867,14 +2931,17 @@ msgstr "Thuisplaatsgrens"
 msgid "Road point"
 msgstr "Wegpunt"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2969,7 +3036,7 @@ msgstr "Wijzig"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
@@ -2988,7 +3055,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3022,12 +3089,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3538,7 +3607,8 @@ msgstr ""
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3546,11 +3616,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3561,28 +3632,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Kleuren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Verwijder kleuren van ontvangen chat berichten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Toon chat kleurenlijst"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3592,31 +3665,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Commando's"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Magie en GM commandos toe in alle chat tabs"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Limieten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Limiteer max karakters in chat lijn"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3626,11 +3701,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Limiteer max lijnen in chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3640,16 +3716,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Logs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Zet chat log aan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3657,31 +3734,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Toon chat geschiedenis"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3691,11 +3771,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3705,16 +3786,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Berichten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Verberg verkoop boodschappen"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3726,11 +3808,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3741,17 +3824,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Plaats alle persoonlijke berichten in tabs"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3762,11 +3846,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Hou magie berichten bij in de 'Debug' tab"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3775,11 +3860,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Toon server berichten in de debug tab"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3789,11 +3875,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Zet handle tab aan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3802,11 +3889,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3816,11 +3904,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Taal tab aanzetten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3829,11 +3918,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Toon alle taal berichten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3843,11 +3933,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Schakel de gevechtstab in"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3857,11 +3948,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "geef de gevechtsevenementen weer"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3869,11 +3961,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3884,27 +3977,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Tijd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Gebruik lokale tijd"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3913,11 +4008,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3926,11 +4022,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3941,16 +4038,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
@@ -3962,7 +4061,7 @@ msgstr "Type:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Vertraging:"
 
@@ -3983,33 +4082,33 @@ msgstr "Blauw:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Statisch"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Regenboog"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Spectrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -4216,9 +4315,10 @@ msgid "Cycle monster targets"
 msgstr "Doorloop monsterdoelwitten"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4329,238 +4429,240 @@ msgstr ""
 msgid "Player"
 msgstr "Speler"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Toon hp statusbalk van jezelf"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Zet snelle statistieken aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Doorloop spelerdoelwitten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Geef de job ervarings berichten weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Geef de spelers popups weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "'Weg van het toetsenbord'-bericht"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Geef je beroep weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Winkel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Accepteer koop/verkoop aanvragen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "shop modus aanzetten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Houd de NPC dialogen bij"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Aanval gecontroleerd door server aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Bot controle aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Laag verkeer modus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Toon achtergrond"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4827,13 +4929,14 @@ msgstr "Handelen toestaan"
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4841,12 +4944,12 @@ msgid "Delete"
 msgstr "Verwijderen"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Relaties"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
@@ -4916,30 +5019,31 @@ msgstr ""
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Thema info"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Thema is gewijzigd"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -5032,8 +5136,8 @@ msgstr "FPS limiet:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Alt FPS limiet: "
 
@@ -5063,16 +5167,18 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Geen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5080,7 +5186,7 @@ msgstr ""
 "faalde ook!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5088,42 +5194,43 @@ msgstr ""
 "modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:           "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
@@ -5242,48 +5349,50 @@ msgstr "Omgevingseffecten"
 msgid "max"
 msgstr "max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Deeltjesdetail"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5328,6 +5437,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr "gebruiker %s uitgenodigd in guild %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5373,11 +5483,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gebruiker %s uitgenodigd in groep."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5432,208 +5544,218 @@ msgstr ""
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Wie is online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "KS"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "UITR"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventaris"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Winkelkar"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "VAAR"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Vaardigheden"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Sociaal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "NL"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "WU"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Weet u"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "WINKEL"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "KL"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "CONF"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Toets: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5663,7 +5785,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -5894,7 +6016,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Spelen"
@@ -5910,23 +6032,23 @@ msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5936,27 +6058,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
@@ -5978,7 +6101,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6141,12 +6265,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6379,8 +6503,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6415,7 +6540,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6439,6 +6565,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
@@ -6478,6 +6605,7 @@ msgstr ""
 msgid "status bar"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr ""
@@ -6686,13 +6814,14 @@ msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6711,23 +6840,46 @@ msgstr "Toon links in aankondigingen"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s wilt %s %s ga je akkoord?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s wilt %s %s ga je akkoord?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s wilt %s %s ga je akkoord?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6738,36 +6890,37 @@ msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6871,21 +7024,23 @@ msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Groep Naam"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -7062,27 +7217,28 @@ msgstr "Actualiseren..."
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -8538,284 +8694,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Kracht"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Behendigheid"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitaliteit"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Intelligentie"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Handigheid"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Geluk"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "M.Aanval"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "M.Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ontwijking"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Aanvalsvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Wandelvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Aanvalsbereik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Authenticatie gefaald."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Geen servers beschikbaar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Deze account is al ingelogd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Snelheidshack gedetecteerd."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Verdubbelde login."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Onbekende connectiefout."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8848,103 +9039,116 @@ msgstr "Oud wachtwoord is ongeldig."
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, c-format
+msgid "hungry level %d"
+msgstr ""
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9653,7 +9857,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10199,12 +10403,12 @@ msgid "%d minutes"
 msgstr "%d minuten"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d seconden"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
diff --git a/po/pl.po b/po/pl.po
index 23d5d2a6e..df2a5ee42 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
@@ -43,21 +43,21 @@ msgstr "Plik wysłano"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -73,35 +73,38 @@ msgid "Cache cleaned"
 msgstr "Cache opróżnione"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Zmienne środowiskowe zostały zrzucone"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Załaduj ustawienia do:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Załaduj ustawienia serwera do:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Załaduj log do:"
 
@@ -136,6 +139,7 @@ msgstr "Brak nazwy gildii."
 msgid "Please specify a name."
 msgstr "Proszę wpisać prawidłową nazwę."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
@@ -154,7 +158,8 @@ msgstr "Return od teraz włącza czat."
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -249,7 +254,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -263,8 +269,9 @@ msgstr "Ignorowanie przychodzących próśb o handel"
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -278,6 +285,7 @@ msgstr "Widoczne na mapie"
 msgid "Human"
 msgstr "Człowiek"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "Unik!"
@@ -359,53 +367,53 @@ msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "skill"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Podążanie: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitowanie: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Widzisz %s"
@@ -415,8 +423,8 @@ msgstr "Widzisz %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -441,9 +449,9 @@ msgid "Floating bubble"
 msgstr "Bąbelek nad głową"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Konfiguracja"
@@ -475,8 +483,9 @@ msgid "About"
 msgstr "O..."
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoc"
@@ -540,9 +549,12 @@ msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -553,7 +565,7 @@ msgstr "Zmiana serwera"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -746,32 +758,37 @@ msgstr "Nieprawidłowy host aktualizacyjny: %s."
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "lub"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1201,7 +1218,7 @@ msgstr "Wiadomość"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Wskrześ"
 
@@ -1223,10 +1240,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "domyślnie"
 
@@ -1387,8 +1405,8 @@ msgstr "Ogromna (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1719,14 +1737,14 @@ msgstr "Utwórz grupę"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1778,13 +1796,17 @@ msgstr "Handel"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Atak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1846,8 +1868,9 @@ msgstr "Podejdź"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Rozmowa"
 
@@ -1860,11 +1883,12 @@ msgstr "Rozmowa"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Kup"
 
@@ -1877,11 +1901,12 @@ msgstr "Kup"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Sprzedaj"
 
@@ -1890,7 +1915,7 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
@@ -1916,7 +1941,7 @@ msgstr "Dodaj do listy atakowanych"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
@@ -1971,9 +1996,10 @@ msgstr "Zdejmij"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -1999,8 +2025,8 @@ msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
@@ -2012,8 +2038,8 @@ msgstr "Podnieś"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
@@ -2028,8 +2054,8 @@ msgstr "Portal"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Usuń"
 
@@ -2037,7 +2063,7 @@ msgstr "Usuń"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Teleport"
 
@@ -2049,11 +2075,11 @@ msgstr "Przesuwaj kamerę"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Stroje"
@@ -2065,8 +2091,8 @@ msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Zaklęcia"
 
@@ -2132,8 +2158,8 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
@@ -2159,43 +2185,57 @@ msgstr "odblokuj"
 msgid "Lock"
 msgstr "zablokuj"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Zmień nazwę drogowskazu "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Nick:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Komentarz gracza          "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Komentarz:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Dodaj 10 do handlu"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Dodaj połowę do handlu"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Dodaj do handlu wszystko-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
@@ -2204,50 +2244,66 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Podaj"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Podaj 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Podaj połowę"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Podaj wszystko-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Podaj wszystko"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Pobierz 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Pobierz połowę"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Pobierz wszystko-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Pobierz wszystko"
 
@@ -2255,58 +2311,59 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "W dół"
 
@@ -2314,30 +2371,30 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Pokaż okno"
 
@@ -2345,7 +2402,7 @@ msgstr "Pokaż okno"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2354,202 +2411,206 @@ msgstr "Poziom: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignoruj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Idź do"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Wyrzuć"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2560,17 +2621,17 @@ msgid "Basic"
 msgstr "Podstawowe"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Skróty"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Okna"
 
@@ -2584,9 +2645,10 @@ msgstr "Emotki"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Czat"
 
@@ -2598,9 +2660,9 @@ msgstr "Czat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2687,10 +2749,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Członkowie grupy"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Członkowie Gildii"
@@ -2873,14 +2937,17 @@ msgstr "Obwódka lokalizacji domowej"
 msgid "Road point"
 msgstr "Drogowskaz"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Poziom: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2975,7 +3042,7 @@ msgstr "Edycja"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
@@ -2994,7 +3061,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3028,12 +3095,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3546,7 +3615,8 @@ msgstr "Okno"
 msgid "Auto hide chat window"
 msgstr "Autoukrywanie okna czatu."
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3554,11 +3624,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr "Podtrzymuj skupienie na pasek czatu."
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3569,28 +3640,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Kolory"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Usuń kolory z odbieranych wiadomości"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Pokazuj listę kolorów czatu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3600,31 +3673,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Polecenia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Pozwól poleceniom magicznym i GM pojawiać się we wszystkich zakładkach"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Limity"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Limit znaków w wierszu czatu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3634,11 +3709,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Limit wierszy w czacie"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3648,16 +3724,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Logi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Włącz logowanie czatu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3665,31 +3742,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Aktywuj logowanie czatu Debug"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Pokazuj historię czatu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr "Pokazuj wiadomości online drużyny"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3699,11 +3779,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Pokazuj wiadomości online gildii"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3713,16 +3794,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Wiadomości"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Ukryj wiadomości od sklepów"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3734,11 +3816,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Pokazuj wiadomości MVP"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3749,17 +3832,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Zakładki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Umieść wszystkie szepty w zakładkach"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3770,11 +3854,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Loguj powiadomienia o magii w zakładce Debug"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3783,11 +3868,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Pokazuj wiadomości serwera w zakładce Debug"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3797,11 +3883,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Włącz tab handlowy"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3810,11 +3897,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Aktywuj zakładkę GM"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3824,11 +3912,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Aktywuj zakładkę \"języki\""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3837,11 +3926,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Pokaż wiadomości ze wszystkich języków"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3851,11 +3941,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Włącz zakładkę bitewną"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3865,11 +3956,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Pokazuj wydarzenia bitewne"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3877,11 +3969,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Jeśli potrzeba, zmień rozmiar zakładek czatu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3892,27 +3985,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Czas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Użyj lokalnego czasu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Podświetlaj słowa (oddzielaj przecinkiem)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3921,11 +4016,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr "Ignoruj imienia globalnie (oddzielone przecinkiem)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3934,11 +4030,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr "Pokazuj przycisk emotek w czacie"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3949,16 +4046,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr "Pokazuj motd serwera podczas startu"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Kolor będzie wyglądał w ten sposób"
@@ -3970,7 +4069,7 @@ msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Opóźnienie:"
 
@@ -3991,33 +4090,33 @@ msgstr "Niebieski:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Statyczny"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Pulsujący"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Tęcza"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Widmo"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -4226,9 +4325,10 @@ msgid "Cycle monster targets"
 msgstr "Przewijaj namierzanie potworów"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4339,238 +4439,240 @@ msgstr "Ruchy relatywne myszką (zalecane do interfejsów dotykowych)"
 msgid "Player"
 msgstr "Gracze"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Pokazuj własny pasek życia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Włącz szybkie statystyki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Przewijaj namierzanie graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Pokazuj wiadomości o punktach doświadczenia umiejętności"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Pokazuj wyskakujące powiadomienia graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Wiadomość AFK"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Pokazuj poziom umiejętności"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Filtruj ataki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Włącz filtr podnoszenia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Włącz protokół reklamowy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr "Aktywuj obsługę zwierzątek."
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Aktywuj powiadomienia dotyczące wagi."
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Sklep"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Akceptuj prośby o handel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Włącz tryb sklepu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "Przewijaj namierzanie NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Loguj dialogi NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Integracja z botami"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Włącz integrację z guild-botem i wyłącz natywną obsługę gildii"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Klawiatura"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Opóźnienie powtarzania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Interwał powtarzania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Własny interwał powtarzania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "Guziki skrótów"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Serwer proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Rodzaj proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Adres serwera:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Włącz atak ze strony serwera"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr "Ukryj stronę wsparcia po wystąpieniu błędu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr "Aktywuj podwójne kliknięcia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Włącz wykrywacza botów"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Włącz ochronę przeciw zbugowanym serwerom"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Włącz logowanie Debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Włącz logowanie OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Aktywuj logowanie wejścia"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Wyślij plik dziennika"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Tryb niskiego transferu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 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_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr "Folder zrzutów ekranu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Opóźnienie sieci między podserwerami"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Pokazuj tło"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Nadpisanie gęstości ekranu"
 
@@ -4839,13 +4941,14 @@ msgstr "Zezwól na handel"
 msgid "Allow whispers"
 msgstr "Zezwól na szepty"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4853,12 +4956,12 @@ msgid "Delete"
 msgstr "Usuń"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Relacje"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Gdy ignorowany:"
 
@@ -4928,30 +5031,31 @@ msgstr "Rozmiar czcionki Npc"
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "Prawa autorskie:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Informacje o Skórce"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Skórka zmieniona"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
 
@@ -5044,8 +5148,8 @@ msgstr "Limit FPS:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Alternatywny limit FPS: "
 
@@ -5075,23 +5179,25 @@ msgid "No frame"
 msgstr "Bez ramki"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Brak"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5099,42 +5205,43 @@ msgstr ""
 "stanu!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Zmiana na tryb pełnoekranowy"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Zmiana na OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Własna rozdzielczość (np. 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Wpisz nową rozdzielczość:            "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Rozdzielczość zmieniona"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Niektóre okna mogą być przesunięte aby dopasować się do niższej "
@@ -5253,48 +5360,50 @@ msgstr "Efekty otoczenia"
 msgid "max"
 msgstr "najlepsze"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Detale cząsteczkowe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Fizyka cząsteczek"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Aktywuj ustawienia gammy."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Wycentruj okno gry"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Pozwól na włączanie się wygaszacza ekranu"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr "Zrzuty ekranu"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr "Dodaj znak wodny do zrzutów ekranu"
 
@@ -5339,6 +5448,7 @@ msgstr "Gracze: %u/%u"
 msgid "Invited user %s to guild %s."
 msgstr "Zaproszono gracza %s do gildii %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5384,11 +5494,13 @@ msgstr "GPS"
 msgid "Portals: %u/%u"
 msgstr "Portale: %u/%u"
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gracz %s zaproszony do grupy."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5443,208 +5555,218 @@ msgstr "Widoczni gracze: %d"
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Gracze online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "PMC"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "OM"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Misje"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "SB"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Statystyki ataku:"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Emotki"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "TX"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Stan"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EKW"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Ekwipunek"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INW"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inwentarz"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Wózek"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "SKI"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Zdolności"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Społeczność"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "MG"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "UP"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "WŻ"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Czy wiesz, że..."
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "SKP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "SÓ"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr "AKT"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr "Aktualizacje"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "OKN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Klawisz: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5674,7 +5796,7 @@ msgstr "Ilość:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Utwórz"
 
@@ -5905,7 +6027,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Graj"
@@ -5921,23 +6043,23 @@ msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Konto: %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5952,27 +6074,28 @@ msgstr ""
 "Doświadczenie: %u\n"
 "Pieniądze: %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Nieprawidłowe hasło"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Wprowadź hasło aby usunąć postać"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
@@ -5994,7 +6117,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "zwierzątko gracza %s's"
@@ -6157,12 +6281,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6397,8 +6521,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6433,7 +6558,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6457,6 +6583,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "pasek życia"
@@ -6496,6 +6623,7 @@ msgstr "pasek strzał"
 msgid "status bar"
 msgstr "pasek statusu"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "pasek punktów umiejętności"
@@ -6704,13 +6832,14 @@ msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Własny sklep"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6729,23 +6858,46 @@ msgstr "Pokazuj linki w ogłoszeniach"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s chce %s%s, akceptujesz?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s chce %s%s, akceptujesz?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Prośba o handel"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s chce %s%s, akceptujesz?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6756,36 +6908,37 @@ msgid "Up"
 msgstr "Podwyż"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dostępne punkty umiejętności: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Zestaw umiejętności %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Umiejętność %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6889,21 +7042,23 @@ msgstr "%s zaprosił/a Cię do grupy."
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Nie można utworzyć grupy. Już należysz do grupy."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
@@ -7080,27 +7235,28 @@ msgstr "Aktualizacja..."
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr "Pokazuj wszystkie wiadomości (może być wolne)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  Spróbuj ponownie później."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -8554,284 +8710,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr "Nie udało się skasować postaci."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr "Siła %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr "Zwinność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr "Żywotność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligencja %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr "Celność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr "Szczęście %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Siła"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Zwinność"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Witalność"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Inteligencja"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Celność"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Szczęście"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Obrona"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "Atak mag."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "Obrona mag."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% celności"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% uników"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% ciosów kryt."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Opóźnienie ataku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Opóźnienie chodu"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Zasięg ataku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Obrażenia na sek."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Brak dostępnych serwerów."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Ktoś inny próbuje użyć konta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "To konto jest już zalogowane."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Wykryto speed hack."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Zduplikowany login."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Nieznany błąd połączenia."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8864,103 +9055,116 @@ msgstr "Stare hasło nieprawidłowe."
 msgid "New password too short."
 msgstr "Nowe hasło jest zbyt krótkie."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Poziom gildii: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nie masz jeszcze wymaganego poziomu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Zbyt niskie HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Zbyt niska mana!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Nie masz notek!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Nie możesz tego teraz zrobić!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Chyba brak Ci kasy... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nie możesz użyć tej umiejętności przy tym rodzaju broni!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Potrzebujesz innego czerwonego klejnotu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Potrzebujesz innego niebieskiego klejnotu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Niesiesz za duży ciężar by to zrobić!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9672,7 +9876,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10217,12 +10421,12 @@ msgid "%d minutes"
 msgstr "%d minut/y"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d sekund/y"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
diff --git a/po/pt.po b/po/pt.po
index 14b41a994..fa290ebb4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
@@ -39,21 +39,21 @@ msgstr ""
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -69,35 +69,38 @@ msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejadas"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -132,6 +135,7 @@ msgstr "Falta o nome da guilda."
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
@@ -150,7 +154,8 @@ msgstr "Agora Enter alterna para o chat."
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -245,7 +250,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -259,8 +265,9 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -274,6 +281,7 @@ msgstr "Visivel no mapa"
 msgid "Human"
 msgstr "Humano"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "desviou"
@@ -354,53 +362,53 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "Profissão"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -410,8 +418,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -436,9 +444,9 @@ msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configurar"
@@ -470,8 +478,9 @@ msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -535,9 +544,12 @@ msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -548,7 +560,7 @@ msgstr "Mudando servidores do jogo"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -746,32 +758,37 @@ msgstr ""
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
@@ -1201,7 +1218,7 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr ""
 
@@ -1224,10 +1241,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "padrão"
 
@@ -1388,8 +1406,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1720,14 +1738,14 @@ msgstr "Criar grupo"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1779,13 +1797,17 @@ msgstr "Negócios"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1847,8 +1869,9 @@ msgstr "Mover"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Falar"
 
@@ -1861,11 +1884,12 @@ msgstr "Falar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1878,11 +1902,12 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vender"
 
@@ -1891,7 +1916,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
@@ -1917,7 +1942,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1972,9 +1997,10 @@ msgstr "Desequipar"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Renomear"
 
@@ -2000,8 +2026,8 @@ msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
@@ -2013,8 +2039,8 @@ msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -2029,8 +2055,8 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "A Remover"
 
@@ -2038,7 +2064,7 @@ msgstr "A Remover"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Urdidura"
 
@@ -2050,11 +2076,11 @@ msgstr "Mover câmera"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Roupas"
@@ -2066,8 +2092,8 @@ msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Feitiços"
 
@@ -2133,8 +2159,8 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
@@ -2160,43 +2186,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -2205,50 +2245,66 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2256,58 +2312,59 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -2315,30 +2372,30 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Mostrar janela"
 
@@ -2346,7 +2403,7 @@ msgstr "Mostrar janela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2355,202 +2412,206 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Adicionar na lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Descartar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2561,17 +2622,17 @@ msgid "Basic"
 msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Atalhos"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2585,9 +2646,10 @@ msgstr "Emoções"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
@@ -2599,9 +2661,9 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2688,10 +2750,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Membros do grupo"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Membros da guilda"
@@ -2874,14 +2938,17 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road point"
 msgstr "Ponto de estrada"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Level: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2976,7 +3043,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -2995,7 +3062,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3029,12 +3096,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3545,7 +3614,8 @@ msgstr "Janela"
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3553,11 +3623,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3568,28 +3639,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Cores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Remover mensagens coloridas do chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Mostrar lista de cores do chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3599,31 +3672,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Comandos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Permitir feitiços e comandos de GM em todas abas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Limites"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Limite de caracteres na linha de chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3633,11 +3708,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Limite de linhas máximas no chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3647,16 +3723,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Logs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Salvar conversas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3664,31 +3741,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Mostrar mensagens antigas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3698,11 +3778,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Mostrar mensagens online da Guilda"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3712,16 +3793,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Mensagens"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Esconder mensagens de loja"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3733,11 +3815,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Ver mensagens MVP"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3748,17 +3831,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Abas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens privadas em abas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3769,11 +3853,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3782,11 +3867,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3796,11 +3882,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3809,11 +3896,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Habilitar aba de gm"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3823,11 +3911,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Habilitar aba de linguagem"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3836,11 +3925,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Mostrar todas mensagens de linguagem"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3850,11 +3940,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3864,11 +3955,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3876,11 +3968,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar as abas de chat caso precisar"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3891,27 +3984,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Tempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Usar hora local"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Palavras Destacadas (separadas por vírgulas)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3920,11 +4015,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3933,11 +4029,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3948,16 +4045,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "A cor vai ficar assim"
@@ -3969,7 +4068,7 @@ msgstr "Tipo:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Atraso:"
 
@@ -3990,33 +4089,33 @@ msgstr "Azul:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Estático"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Pulso"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Arco-íris"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Espectro"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -4225,9 +4324,10 @@ msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4338,238 +4438,240 @@ msgstr "Movimentos relativos do mouse (bom para interfaces de toque)"
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Mensagem em modo Ausente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Mostrar job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "A habilitar filtro de ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Habilitar filtro de pegar itens"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Habilitar protocolo de aviso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Habilitar notificações de peso"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Loja"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "Alvo de NPC em ciclo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Suporte de bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Atraso de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Intervalo de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Intervalo de repetição customizado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "Botões de atalho"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Servidor Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 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_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Ativar LOG OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Habilitar log de entrada"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 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_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Atraso de rede entre os sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Substituição de densidade de tela"
 
@@ -4836,13 +4938,14 @@ msgstr "Permitir negociações"
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4850,12 +4953,12 @@ msgid "Delete"
 msgstr "Excluir"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Relações"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
@@ -4925,30 +5028,31 @@ msgstr "Tamanho da fonte de NPC"
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Nome: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "direitos autorais:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Informação de Temas"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -5041,8 +5145,8 @@ msgstr "Limite de FPS:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Limite de FPS alternativo: "
 
@@ -5072,23 +5176,25 @@ msgid "No frame"
 msgstr "Sem moldura de janela"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5096,42 +5202,43 @@ msgstr ""
 "anterior!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -5249,48 +5356,50 @@ msgstr "Ambiente FX"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Física de partículas"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Habilitar controle de gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Centro de janela do jogo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Permitir proteção de tela"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5335,6 +5444,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5380,11 +5490,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5439,208 +5551,218 @@ msgstr ""
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Quem esta online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "AJD"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "MSS"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Missões"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "EST"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Smileys"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "JC"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EQU"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Equipamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventário"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Carrinho"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "HAB"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "AT"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "FE"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "DE"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "VS"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Você sabia"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5670,7 +5792,7 @@ msgstr "Quantidade:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Criar"
 
@@ -5901,7 +6023,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Jogar"
@@ -5917,23 +6039,23 @@ msgid "Info"
 msgstr "Informações"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Conta %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5948,27 +6070,28 @@ msgstr ""
 "Experiência: %u\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Senha Incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Entre com a Senha para Deletar o usuario"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
@@ -5990,7 +6113,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6153,12 +6277,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6391,8 +6515,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6427,7 +6552,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6451,6 +6577,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Barra de Vida"
@@ -6490,6 +6617,7 @@ msgstr "Barra de flechas"
 msgid "status bar"
 msgstr "Barra de Status"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "Barra de Job"
@@ -6698,13 +6826,14 @@ msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6723,23 +6852,46 @@ msgstr "Mostrar links em anúncio"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s quer %s %s você aceita?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s quer %s %s você aceita?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s quer %s %s você aceita?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6750,36 +6902,37 @@ msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6883,21 +7036,23 @@ msgstr "%s te convidou para entrar em seu grupo."
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -7073,27 +7228,28 @@ msgstr "Atualizando..."
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Concluído"
 
@@ -8549,284 +8705,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Força"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Agilidade"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitalidade"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Inteligência"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Destreza"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Sorte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Defesa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8859,103 +9050,116 @@ msgstr "Senha antiga incorreta."
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Nível Guilda: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9664,7 +9868,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10210,12 +10414,12 @@ msgid "%d minutes"
 msgstr "%d minutos"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index da6fa9de0..6fd89fba5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
@@ -50,21 +50,21 @@ msgstr "Arquivo enviado"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -80,35 +80,38 @@ msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejada"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "A|rquivos de configuração enviados para:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Configuração de servidor enviada para:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Registro enviado em:"
 
@@ -145,6 +148,7 @@ msgstr "Falta o nome da guilda."
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
@@ -163,7 +167,8 @@ msgstr "Agora Enter alterna para o chat."
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr "chapéu %s equipado."
@@ -258,7 +263,8 @@ msgstr "Config value: %s"
 msgid "Server config value: %s"
 msgstr "Server config value: %s"
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr "Renomeie seu animal de estimação"
 
@@ -272,8 +278,9 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr "Rápido"
 
@@ -287,6 +294,7 @@ msgstr "Mapa visivel"
 msgid "Human"
 msgstr "Humano"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "desviou"
@@ -367,53 +375,53 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "profissão"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr "mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguindo: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -423,8 +431,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -449,9 +457,9 @@ msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configurar"
@@ -483,8 +491,9 @@ msgid "About"
 msgstr "Sobre"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -548,9 +557,12 @@ msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -561,7 +573,7 @@ msgstr "Mudando de servidor do jogo"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -758,32 +770,37 @@ msgstr "Host de atualização inválido: %s."
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "ou"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
@@ -1213,7 +1230,7 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Reviver"
 
@@ -1236,10 +1253,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "padrão"
 
@@ -1400,8 +1418,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1732,14 +1750,14 @@ msgstr "Criar grupo"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1791,13 +1809,17 @@ msgstr "Negociação"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1859,8 +1881,9 @@ msgstr "Mover"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Falar"
 
@@ -1873,11 +1896,12 @@ msgstr "Falar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1890,11 +1914,12 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vender"
 
@@ -1903,7 +1928,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
@@ -1929,7 +1954,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1984,9 +2009,10 @@ msgstr "Desequipar"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Renomear"
 
@@ -2012,8 +2038,8 @@ msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
@@ -2025,8 +2051,8 @@ msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -2041,8 +2067,8 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Remover"
 
@@ -2050,7 +2076,7 @@ msgstr "Remover"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Urdidura"
 
@@ -2062,11 +2088,11 @@ msgstr "Mover câmera"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Roupas"
@@ -2078,8 +2104,8 @@ msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Feitiços"
 
@@ -2145,8 +2171,8 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
@@ -2172,43 +2198,57 @@ msgstr "Desbloquear"
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Renomear mapa            "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Adicionar na negociação"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Adicionar 10 na negociação"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Adicionar metade na negociação"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para negociação-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Adicionar todos na negociação"
 
@@ -2217,50 +2257,66 @@ msgstr "Adicionar todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2268,58 +2324,59 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr "Abrir as configurações da barra amarela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -2327,30 +2384,30 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Mostrar Janela"
 
@@ -2358,7 +2415,7 @@ msgstr "Mostrar Janela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2367,202 +2424,206 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr "Level máximo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr "Entrar no chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Adicionar a lista de captura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Descartar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "Checar IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr "Silenciar %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr "Liberar %d"
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr "Level: %d / %d"
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr "Level: Desconhecido"
@@ -2573,17 +2634,17 @@ msgid "Basic"
 msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Atalhos"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2597,9 +2658,10 @@ msgstr "Emoticons"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
@@ -2611,9 +2673,9 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2700,10 +2762,12 @@ msgstr "Homúnculos"
 msgid "Skill unit"
 msgstr "Unidade de habilidade"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Membros do grupo"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Membros da guilda"
@@ -2886,14 +2950,17 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road point"
 msgstr "Ponto de estrada"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Nível: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2988,7 +3055,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -3007,7 +3074,7 @@ msgstr "Tipo: %s"
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -3041,12 +3108,14 @@ msgstr "Armadilha alvo"
 msgid "Unknown:"
 msgstr "Desconhecido(a):"
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr "Alcance: %d"
@@ -3557,7 +3626,8 @@ msgstr "Janela"
 msgid "Auto hide chat window"
 msgstr "Auto ocultar janela de chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3568,11 +3638,12 @@ msgstr ""
 "Pressione enter ou passe o cursor para exibir o bate-papo novamente."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr "Proteger foco do chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3587,17 +3658,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Cores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Remover mensagens coloridas do chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
@@ -3607,11 +3679,12 @@ msgstr ""
 "habilitado."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Mostrar lista de cores do chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3626,16 +3699,17 @@ msgstr ""
 "facilmente, mas também ocupa algum espaço na janela de bate-papo."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Comandos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Permitir feitiços e comandos de GM em todas abas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
@@ -3643,16 +3717,17 @@ msgstr ""
 "GM em qualquer guia."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Limites"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Limite de caracteres na linha de chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3666,11 +3741,12 @@ msgstr ""
 "que esse limite serão cortadas."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Limite de linhas máximas no chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3685,16 +3761,17 @@ msgstr ""
 "Nota: mantendo muitas linhas na rolagem podem deixar o cliente lento."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Logs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Salvar conversas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3706,20 +3783,22 @@ msgstr ""
 "Nota: Com o passar do tempo isto pode consumir muito espaço do disco."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Habilitar depurador de chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr "Caso habilite esta, guia de depuração também será armazenada em disco."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Mostrar mensagens antigas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
@@ -3729,11 +3808,12 @@ msgstr ""
 "papo vazias."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr "Mostrar mensagens de membros do grupo online"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3748,11 +3828,12 @@ msgstr ""
 "amigos estão online."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Mostrar mensagens de guildas online"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3767,16 +3848,17 @@ msgstr ""
 "amigos estão online."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Mensagens"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Esconder mensagens de loja"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3795,11 +3877,12 @@ msgstr ""
 "quando os jogadores estão  olhando sua loja."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Ver Mensagens MVP"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3814,17 +3897,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Abas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens privadas em abas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3842,11 +3926,12 @@ msgstr ""
 "whispers na aba geral pode ser bastante confuso."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3860,11 +3945,12 @@ msgstr ""
 "conjurado.."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3881,11 +3967,12 @@ msgstr ""
 "as mensagens do servidor falso."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3899,11 +3986,12 @@ msgstr ""
 "irão ser exibidas na aba geral."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Habilitar aba de gm"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3918,11 +4006,12 @@ msgstr ""
 "aba só aparece para GMs."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Habilitar aba de idiomas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3935,11 +4024,12 @@ msgstr ""
 "Nota: apenas o servidor Evol tem suporte para isto ate o momento."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Mostrar mensagens de todos idiomas"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3955,11 +4045,12 @@ msgstr ""
 "como o Evol."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3974,11 +4065,12 @@ msgstr ""
 "Nota: É necessário reiniciar o cliente para as alterações terem efeito."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3989,11 +4081,12 @@ msgstr ""
 "Se desativado, nenhuma mensagem de batalha será exibida."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar aba de chat caso precisar"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -4011,16 +4104,17 @@ msgstr ""
 "utilizável para texto."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Tempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Usar tempo local"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
@@ -4030,11 +4124,12 @@ msgstr ""
 "tempo do servidor será usado (normalmente é o GMT+0)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Palavras destacadas (separadas em vírgulas)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4047,11 +4142,12 @@ msgstr ""
 "Nota: Isto pode ser irritante - use este recurso com sabedoria."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr "Nomes globais à ignorar (separados por virgula)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4066,11 +4162,12 @@ msgstr ""
 "importantes!"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr "Mostrar botão de emoticon no chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4087,11 +4184,12 @@ msgstr ""
 "normalmente F1 por padrão."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr "Mostrar mensagem do dia ao começar"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4100,6 +4198,7 @@ msgstr ""
 "(mensagem do dia) uma vez que você se conectar ao servidor. Desative-a para "
 "esconder não ter a MOTD exibida."
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "A cor vai ficar assim"
@@ -4111,7 +4210,7 @@ msgstr "Tipo:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Atraso:"
 
@@ -4132,33 +4231,33 @@ msgstr "Azul:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Estático"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Pulso"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Arco-íris"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Espectro"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -4367,9 +4466,10 @@ msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4480,238 +4580,240 @@ msgstr "Movimentos relativos ao mouse (bom para interfaces de toque)"
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Mensagem em modo Ausente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Mostrar job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Habilitar filtro de captura"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Habilitar o protocolo de aviso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr "Habilitar suporte a animais de estimação"
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Habilitar notificações de peso"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Loja"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "Alvo NPC em ciclos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Suporte de bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr "Ativar o suporte ao bot ManaMarket."
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Atraso de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Intervalo de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Intervalo de repetição personalizado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "botões de atalho"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 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_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr "Habilitar duplo clique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 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_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr "Ignorar pacotes de registro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr "Registrar pacotes não implementados"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Ativar LOG OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Habilitar log de entrada"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Arquivo de registro enviado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 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_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr "Diretório de captura de tela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Atraso de rede entre sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Ultrapassar Densidade da tela"
 
@@ -4982,13 +5084,14 @@ msgstr "Permitir negociações"
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4996,12 +5099,12 @@ msgid "Delete"
 msgstr "Excluir"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Relações"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
@@ -5071,30 +5174,31 @@ msgstr "Tamanho de fonte de NPC"
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Nome: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "Direitos Autorais:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Informação de Tema"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -5187,8 +5291,8 @@ msgstr "Limite de FPS:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Limite de FPS alternativo: "
 
@@ -5218,23 +5322,25 @@ msgid "No frame"
 msgstr "Sem moldura de janela"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5242,42 +5348,43 @@ msgstr ""
 "anterior!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução             "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -5395,48 +5502,50 @@ msgstr "Ambiente FX"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Física de partículas"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Habilitar controle gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Centro da janela de jogo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Permitir rodar proteção de tela"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr "Capturas de Tela"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr "Adicionar marca d'água nas capturas de tela"
 
@@ -5481,6 +5590,7 @@ msgstr "Jogadores: %u/%u"
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5526,11 +5636,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr "Portais: %u/%u"
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5585,208 +5697,218 @@ msgstr "Jogadores visíveis: %d"
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Quem esta online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "AJU"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "MSS"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Missões"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "EST"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Carinhas"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EQU"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Equipamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventário"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr "CA"
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Carrinho"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "HAB"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "AT"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "FE"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "DE"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "YK"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Você Sabia"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "LOJ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "RO"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr "CIMA"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr "Atualizações"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr "BA"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banco"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr "MA"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr "Email"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Dinheiro no banco: %s"
@@ -5816,7 +5938,7 @@ msgstr "Quantidade:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Criar"
 
@@ -6047,7 +6169,7 @@ msgstr "Senha"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Jogar"
@@ -6063,23 +6185,23 @@ msgid "Info"
 msgstr "Informações"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Conta %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr "Por favor insira novo pincode"
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr "Por favor insira o novo nome"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6094,27 +6216,28 @@ msgstr ""
 "Experiência: %u\n"
 "Dinheiro: %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Senha incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr "Insira seu e-mail para deletar personagem"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr "Insira e-mail:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Entre com a senha para apagar o personagem"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
@@ -6136,7 +6259,8 @@ msgid "Broken nick detected: "
 msgstr "Apelido suspeito detectado: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "Animal de estimação de %s"
@@ -6299,12 +6423,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr "Insira o cartão requisitado"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "insira %s em %s?"
@@ -6537,8 +6661,9 @@ msgid "Money:"
 msgstr "Dinheiro:"
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr "Item:"
 
@@ -6573,7 +6698,8 @@ msgstr "Hora:"
 msgid "From:"
 msgstr "De:"
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr "Se apegue"
 
@@ -6597,6 +6723,7 @@ msgstr "Retornar"
 msgid "Open"
 msgstr "Abrir"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Barra de Vida"
@@ -6636,6 +6763,7 @@ msgstr "Barra de flechas"
 msgid "status bar"
 msgstr "Barra de Status"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "Barra de Job"
@@ -6844,13 +6972,14 @@ msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr "Publicar"
 
@@ -6869,23 +6998,47 @@ msgstr "Mostrar links em anúncio"
 msgid "Please enter new shop name"
 msgstr "Por favor digite o nome da nova loja"
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr "Despublicar"
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+#, fuzzy
+msgid "error: player busy"
+msgstr "Move jogador para cima"
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s quer %s %s você aceita?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s quer %s %s você aceita?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s quer %s %s você aceita?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Loja Pessoal - %s"
@@ -6896,36 +7049,37 @@ msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Habilidade falhou: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Adicione um texto a habilidade %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr "Texto: "
 
@@ -7029,21 +7183,23 @@ msgstr "%s te convidou para entrar em seu grupo."
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -7219,27 +7375,28 @@ msgstr "Atualizando..."
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr "Mostrar todas as noticias (pode ser lento)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Concluído"
 
@@ -8696,284 +8853,319 @@ msgstr "Personagem não encontrado."
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr "Não é possível conjurar habilidade nesta área."
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr "Não é possível usar item nesta área."
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr "Não é possível equipar. Nível errado."
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr "Não é possível usar. Nível errado."
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr "Trabalho em andamento."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Mensagem não pode ser enviada, canal %s não existe."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Não pode abrir canal. Canal %s não existe."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr "Força %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr "Agilidade %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalidade %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligência %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr "Sorte %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Força"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Agilidade"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitalidade"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Inteligência"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Destreza"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Sorte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Defesa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "Ataque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "Defesa M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Precisão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Distância de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr "Carma"
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr "Etiqueta"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr "Servidor lotado."
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr "Desculpe, você está abaixo da idade permitida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr "Muitas conexões do mesmo IP."
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr "Não pago no momento."
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr "Pagamento suspenso."
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr "Pagamento modificado."
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr "IP de pagamento errado."
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr "Pagar sala de jogo."
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr "Desconexão forçada pelo GM."
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr "Ban Japan refuse."
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr "Manteve-se outra conta."
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr "IP hostil."
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr "Contagem geral de IP."
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr "Contagem de IP."
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr "Memória."
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr "HAN válido."
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr "Acesso limitado de IP."
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr "Acima da lista de personagens."
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr "IP bloqueado."
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr "Contagem de senha inválida."
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr "Raça não permitida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr "Mapa não encontrado."
 
@@ -9006,103 +9198,116 @@ msgstr "Senha antiga incorreta."
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Você tem um novo E-mail de %s assunto %s"
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Nível Guilda: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Erro desconhecido de habilidade: %d"
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Erro desconhecido de habilidade: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr "Falha ao sumonar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr "Precisa de espíritos."
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr "Precisa de equipamentos %s."
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Precisa de equipamentos %s e da quantidade %d"
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr "Precisa do item %s."
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Precisa do item %s e da quantidade %d"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr "Selecione o alvo do warp"
 
@@ -9811,7 +10016,8 @@ msgstr "Captura de animal de estimação falhou."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+#, fuzzy
+msgid "Pet caught."
 msgstr "Animal de estimação capturado."
 
 #. TRANSLATORS: notification message
@@ -10363,12 +10569,12 @@ msgid "%d minutes"
 msgstr "%d Minutos"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
diff --git a/po/ru.po b/po/ru.po
index cc7c1346e..73dc725cc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 11:00+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
@@ -49,21 +49,21 @@ msgstr "Файл выгружен"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -79,35 +79,38 @@ msgid "Cache cleaned"
 msgstr "Кеш очищен"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
@@ -142,6 +145,7 @@ msgstr "Не задано имя гильдии."
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Enter переключает Вас на окно чата."
@@ -160,7 +164,8 @@ msgstr "Теперь Return переключает чат."
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr "Одета шапка: %s."
@@ -255,7 +260,8 @@ msgstr "Значение настройки: %s"
 msgid "Server config value: %s"
 msgstr "Значение настройки для этого сервера: %s"
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr "Переименовать животное"
 
@@ -269,8 +275,9 @@ msgstr "Игнорировать предложения о торговле"
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr "Быстро"
 
@@ -284,6 +291,7 @@ msgstr "Видимые на карте"
 msgid "Human"
 msgstr "Человек"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "уклонение"
@@ -366,53 +374,53 @@ msgstr[3] "Вы подняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "опыт"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "работа"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr "здоровье"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr "мана"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Следовать за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Имитация: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Вы видите %s"
@@ -422,8 +430,8 @@ msgstr "Вы видите %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -448,9 +456,9 @@ msgid "Floating bubble"
 msgstr "Плавающий пузырек"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Настройка"
@@ -482,8 +490,9 @@ msgid "About"
 msgstr "О Программе"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Помощь"
@@ -547,9 +556,12 @@ msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -560,7 +572,7 @@ msgstr "Смена игрового сервера"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -755,32 +767,37 @@ msgstr "Некорректный сервер обновлений: %s."
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd исходный_файл строка_цвета файл_назначения"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "или"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Отладка"
@@ -1210,7 +1227,7 @@ msgstr "Сообщение"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Оживить"
 
@@ -1233,10 +1250,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "По умолчанию"
 
@@ -1397,8 +1415,8 @@ msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1729,14 +1747,14 @@ msgstr "Создать группу"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1788,13 +1806,17 @@ msgstr "Торговать"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Атака"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1856,8 +1878,9 @@ msgstr "Движение"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Разговор"
 
@@ -1870,11 +1893,12 @@ msgstr "Разговор"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Купить"
 
@@ -1887,11 +1911,12 @@ msgstr "Купить"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Продать"
 
@@ -1900,7 +1925,7 @@ msgstr "Продать"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
@@ -1926,7 +1951,7 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
@@ -1981,9 +2006,10 @@ msgstr "Снять"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -2009,8 +2035,8 @@ msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
@@ -2022,8 +2048,8 @@ msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
@@ -2038,8 +2064,8 @@ msgstr "Элемент карты"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Удалить"
 
@@ -2047,7 +2073,7 @@ msgstr "Удалить"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Прыгнуть"
 
@@ -2059,11 +2085,11 @@ msgstr "Передвинуть камеру"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Наряды"
@@ -2075,8 +2101,8 @@ msgid "Clear outfit"
 msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Заклинания"
 
@@ -2142,8 +2168,8 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
@@ -2169,43 +2195,57 @@ msgstr "Разблокировать"
 msgid "Lock"
 msgstr "Заблокировать"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Имя:                     "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Комментарий игрока        "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Комментарий:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Добавить к торговле все-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
@@ -2214,50 +2254,66 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Сохранить все-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Сохранить все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Забрать все-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Получить все"
 
@@ -2265,58 +2321,59 @@ msgstr "Получить все"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr "Открыть настройки желтой панели"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2324,30 +2381,30 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Показать окно"
 
@@ -2355,7 +2412,7 @@ msgstr "Показать окно"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2364,202 +2421,206 @@ msgstr "Уровень: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr "Макс. уровень"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr "Присоединиться к чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Бросить все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Кикнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr "Приглушить %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr "Убрать пришлушение %d"
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr "Уровень: %d / %d"
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr "Уровень: Неизвестно"
@@ -2570,17 +2631,17 @@ msgid "Basic"
 msgstr "Основное"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Горячие клавиши"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Окна"
 
@@ -2594,9 +2655,10 @@ msgstr "Смайлы"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Чат"
 
@@ -2608,9 +2670,9 @@ msgstr "Чат"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2697,10 +2759,12 @@ msgstr "Гомункул"
 msgid "Skill unit"
 msgstr "Объект скила"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Члены группы"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Члены гильдии"
@@ -2883,14 +2947,17 @@ msgstr "Граница домашней позиции"
 msgid "Road point"
 msgstr "Точка дороги"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Уровень: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2985,7 +3052,7 @@ msgstr "Изменить"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
@@ -3004,7 +3071,7 @@ msgstr "Тип: %s"
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr "Неизвестный"
 
@@ -3038,12 +3105,14 @@ msgstr "Ловушка"
 msgid "Unknown:"
 msgstr "Неизвестно:"
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Мана: -%d"
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr "Дистанция: %d"
@@ -3554,7 +3623,8 @@ msgstr "Окно"
 msgid "Auto hide chat window"
 msgstr "Автоматически прятать окно чата"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3565,11 +3635,12 @@ msgstr ""
 "Нажмите Enter или наведите курсор, чтобы показать чат снова."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr "Защитить фокус чата"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3580,28 +3651,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Цвета"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Удалить цвета из полученных сообщений в чате"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Показать список цветов чата"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3611,31 +3684,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Команды"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Разрешить магические и администраторские команды на всех вкладках"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Ограничения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Ограничить число символов в строке чата"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3645,11 +3720,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Ограничить число строк в чате"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3659,16 +3735,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Логи"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Включить лог чата"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3676,31 +3753,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Вести лог чата отладки"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Показать историю чата"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr "Показывать информацию о подключениях в чате группы"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3710,11 +3790,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Показывать информацию о подключениях в чате гильдии"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3724,16 +3805,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Сообщения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Скрыть сообщения магазина"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3745,11 +3827,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Показывать MVP сообщения"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3760,17 +3843,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Страницы"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Личные сообщения во вкладках"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3781,11 +3865,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Оставлять сообщения магии на вкладке отладки"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3794,11 +3879,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Показывать сообщения сервера на вкладке отладки"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3808,11 +3894,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Включить вкладки торговли"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3821,11 +3908,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Включить страницу чата для гм"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3835,11 +3923,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Включить в чате закладку для языка"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3848,11 +3937,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Показывать сообщения на всех языках"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3862,11 +3952,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Включить вкладку боя"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3876,11 +3967,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Показать сообщения боя"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3888,11 +3980,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Подгонять размер чата"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3903,27 +3996,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Время"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Использовать местное время"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Подсвечиваемые слова (разделенные запятыми)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3932,11 +4027,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr "Игнорировать глобальные сообщения с именами (разделенные запятой)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3945,11 +4041,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr "Показывать кнопку эмоций в чате"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3960,16 +4057,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr "Показывать motd сообщение сервера"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Вот, как выглядит сей цвет"
@@ -3981,7 +4080,7 @@ msgstr "Введите:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Задержка:"
 
@@ -4002,33 +4101,33 @@ msgstr "Синий:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Статичный"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Пульсирующий"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Радуга"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Спектр"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
@@ -4237,9 +4336,10 @@ msgid "Cycle monster targets"
 msgstr "Прокручивать прицел по монстрам"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4350,238 +4450,240 @@ msgstr "Относительное движение мышью (подходит
 msgid "Player"
 msgstr "Игрок"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Показывать свою жизнь"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Включить быструю смену статов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Прокручивать прицел по игрокам"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Показ. всплыв. сообщения игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Ответ в режиме \"отошел\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Показывать уровень работы"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Включить фильтр атак"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Включить фильтр поднятия"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Включить режим посылки состояния"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr "Включить поддержку животных"
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Включить напоминание о весе"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Магазин"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Принимать запросы купить/продать"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "Прокручивать прицел по НИП (NPC)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Сохранять текст НИП"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Поддержка ботов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Включить поддержку гильд-бота"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr "Включить поддержку бота ManaMarket"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Клавиатура"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Задержка перед повтором"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Интервал повторения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Специальное время повтора клавиш"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "Кнопки"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Прокси сервер"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Тип прокси"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Прокси адрес:порт"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr "При выводе ошибки, прятать ссылку на страницу поддержки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr "Включить поддержку двойного клика"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Включить защиту от бажных серверов (не выключать!)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr "Исключить из логгирования пакеты"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr "Лог нереализованных пакетов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Включить лог OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Включить лог ввода"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Выгрузить лог файл"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Режим кеширования игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Использовать FBO для скриншотов (только в режиме opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr "Путь для снимков экрана"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Задержка между сетевыми соединениями"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Показать фон"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Переопределение плотности экрана"
 
@@ -4855,13 +4957,14 @@ msgstr "Разрешить торговлю"
 msgid "Allow whispers"
 msgstr "Разрешить шептание"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4869,12 +4972,12 @@ msgid "Delete"
 msgstr "Удалить"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Связи"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Когда игнорируется:"
 
@@ -4944,30 +5047,31 @@ msgstr "Размер шрифта НИП (NPC)"
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Название: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "Авторские права:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Информация о теме"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Перезагрузите игру дабы изменения вступили в силу."
 
@@ -5060,8 +5164,8 @@ msgstr "Ограничить кадр/с:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
@@ -5091,16 +5195,18 @@ msgid "No frame"
 msgstr "Без рамки"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Нет"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5108,7 +5214,7 @@ msgstr ""
 "удалось!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5116,42 +5222,43 @@ msgstr ""
 "также не удалось!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Введите новое разрешение:            "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Разрешение экрана изменено"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
@@ -5270,48 +5377,50 @@ msgstr "Эффекты окружающей среды"
 msgid "max"
 msgstr "макс."
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Детализация частиц"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Физика частиц"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Гамма"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Включить гамма коррекцию"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Вертикальная синхронизация"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Центрировать игровое окно"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Разрешить запуск скринсейвера"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr "Снимки экрана"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr "Добавлять водяной знак на снимки экранов"
 
@@ -5356,6 +5465,7 @@ msgstr "Игроков: %u/%u"
 msgid "Invited user %s to guild %s."
 msgstr "Пользователь %s приглашен в гильдию %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5401,11 +5511,13 @@ msgstr "Нав"
 msgid "Portals: %u/%u"
 msgstr "Порталов: %u/%u"
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Пригласить пользователя %s в группу."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5460,208 +5572,218 @@ msgstr "Видимых игроков: %d"
 msgid "ONL"
 msgstr "КО"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Кто онлайн"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "СПР"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "КВ"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Квесты"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "СА"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Статистика убийств"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Смайлы"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "ЧАТ"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "СО"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Состояние"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "СН"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Снаряжение"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "ИНВ"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Инвентарь"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr "ТЕ"
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Телега"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "КАР"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "УМ"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Навыки"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "ОБЩ"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Общество"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "ГК"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "ЗАК"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "БР"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "ВЗ"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Знаете ли вы"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "МАГ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "НАР"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr "ОБ"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr "Обновления"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr "БА"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Банк"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr "ПО"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr "Почта"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "ОТЛ"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "ОКН"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "ОПЦ"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Клавиша: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Денег в банке: %s"
@@ -5691,7 +5813,7 @@ msgstr "Количество:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Создать"
 
@@ -5922,7 +6044,7 @@ msgstr "Пароль"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Играть"
@@ -5938,23 +6060,23 @@ msgid "Info"
 msgstr "Сведения"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Аккаунт %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr "Пожалуйста, установите новый пин код"
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr "Пожалуйста, введите новое имя"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5969,27 +6091,28 @@ msgstr ""
 "Опыт: %u\n"
 "Деньги: %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr "Введите ваш email для удаления персонажа"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr "Введите email:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Введите пароль для удаления персонажа"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
@@ -6011,7 +6134,8 @@ msgid "Broken nick detected: "
 msgstr "Обнаружен некорректный ник: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "животное %s'а"
@@ -6174,12 +6298,12 @@ msgid "E"
 msgstr "С"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr "Вопрос о вставке карты"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Вставить %s в %s?"
@@ -6416,8 +6540,9 @@ msgid "Money:"
 msgstr "Деньги:"
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr "Премет:"
 
@@ -6452,7 +6577,8 @@ msgstr "Время:"
 msgid "From:"
 msgstr "От:"
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr "Получить вложение"
 
@@ -6476,6 +6602,7 @@ msgstr "Вернуть"
 msgid "Open"
 msgstr "Открыть"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "здоровье"
@@ -6515,6 +6642,7 @@ msgstr "стрелы"
 msgid "status bar"
 msgstr "статус"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "работа"
@@ -6723,13 +6851,14 @@ msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Свой магазин"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr "Опубликовать"
 
@@ -6748,23 +6877,47 @@ msgstr "Показывать ссылки"
 msgid "Please enter new shop name"
 msgstr "Пожалуйста, введите имя вашего магазина"
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr "Убрать"
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+#, fuzzy
+msgid "error: player busy"
+msgstr "Движение игрока вверх"
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s хочет %s %s, вы принимаете предложение?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s хочет %s %s, вы принимаете предложение?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s хочет %s %s, вы принимаете предложение?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Персональный магазин - %s"
@@ -6775,36 +6928,37 @@ msgid "Up"
 msgstr "Верх"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Навык %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Навык %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Неудача навыка: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Добавить текст к скилу %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr "Текст: "
 
@@ -6908,21 +7062,23 @@ msgstr "%s приглашает Вас к себе в группу."
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Имя группы"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
@@ -7099,27 +7255,28 @@ msgstr "Обновление..."
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr "Показать все новости (может быть медленным)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Завершено"
 
@@ -8574,284 +8731,319 @@ msgstr "Персонаж не найден."
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr "Здесь невозможно выполнить заклинание."
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr "Здесь невозможно использовать предмет."
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr "Невозможно одеть, некорректный уровень."
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr "Невозможно использовать, некорректный уровень."
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr "Идет работа."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Сообщение не может быть отправлено, т.к. канал %s не существует."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Не возможно открыть канал. Канал %s не существует."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr "Сила (str) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr "Выносливость (agi) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr "Живучесть (vit) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr "Интеллект (int) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr "Ловкость (dex) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr "Удача (luk) %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Сила (str)"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Выносливость (agi)"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Живучесть (vit)"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Интеллект (int)"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Ловкость (dex)"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Удача (luk)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "Маг. Атака"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "Маг.Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Точности"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Уклонения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Критический удар"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Задержка атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Задержка движения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Зона атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Урон в сек."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr "Карма"
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr "Манеры"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Ошибка авторизации."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Нет доступных серверов."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Этот аккаунт уже в сети."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Обнаружен взлом скорости."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr "Сервер переполнен."
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr "К сожалению вы несовершеннолетний."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Двойная попытка подключения."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr "Слишком много соединений с одного адреса."
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr "Не оплачено."
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr "Оплата приостановлена."
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr "Оплата изменена."
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr "Оплачен другой адрес."
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr "Оплатите за комнату."
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr "ГМ отключил вас от сервера."
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr "Японский бан."
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr "Остались другие аккаунты."
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr "Неправильный адрес."
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr "Превышение колчиства соединений с одного адреса."
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr "Превышение колчиства соединений с одного адреса."
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr "Память."
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr "Корректный han."
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr "Ограничение по ip адресу."
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr "Слишком много персонажей."
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr "IP-адрес заблокирован."
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr "Некорректное число символов в пароле."
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr "Некорректная расса."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Неизвестная ошибка подключения."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr "Карта не найдена"
 
@@ -8884,103 +9076,116 @@ msgstr "Старый пароль указан неверно."
 msgid "New password too short."
 msgstr "Новый пароль слишком короткий."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Вам пришло сообщение от %s и заголовком %s"
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Уровень гильдии: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Неизвестная ошибка навыков: %d"
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Неисвестная ошибка умений: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У Вас недостаточный уровень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Недостаточно ОЖ!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Недостаточно Маны!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "У Вас нет записей!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Похоже, Вам нужно больше денег... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать этот навык с данным видом оружия!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Вам нужен другой красный камень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Вам нужен другой синий камень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr "Ошибка вызова монстра."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr "Необходима сущьность."
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr "Необходимо снаряжение %s."
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Нужно снаряжение %s в количестве %d"
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr "Нужен предмет %s."
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Нужен предмет %s в количестве %d."
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr "Выберите точку назначения"
 
@@ -9688,7 +9893,8 @@ msgstr "Попытка поймать не удалась."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+#, fuzzy
+msgid "Pet caught."
 msgstr "Питомец пойман."
 
 #. TRANSLATORS: notification message
@@ -10239,12 +10445,12 @@ msgid "%d minutes"
 msgstr "%d минут"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d секунда"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
diff --git a/po/sr.po b/po/sr.po
index 4b8d390d4..7ebccd124 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
@@ -38,21 +38,21 @@ msgstr ""
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -68,35 +68,38 @@ msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -131,6 +134,7 @@ msgstr "Nedostaje ime udruženja."
 msgid "Please specify a name."
 msgstr "Definiši ime."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "\"Enter\" uključuje ili isključuje ćaskanje."
@@ -149,7 +153,8 @@ msgstr "\"Enter\" sada uključuje ili isključuje ćaskanje."
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara ćaskanje."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -244,7 +249,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -258,8 +264,9 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -273,6 +280,7 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "izbegnuto"
@@ -354,53 +362,53 @@ msgstr[2] "Pokupio %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -410,8 +418,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr ""
 
@@ -436,9 +444,9 @@ msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Podešavanje"
@@ -470,8 +478,9 @@ msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoć"
@@ -535,9 +544,12 @@ msgid "Changing game servers"
 msgstr "Menjam server igre"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -548,7 +560,7 @@ msgstr "Menjam server igre"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -741,32 +753,37 @@ msgstr ""
 msgid "Error creating updates directory!"
 msgstr "Greška prilikom kreiranja \"updates\" direktorijuma!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Greška: %s ne postoji i ne može da se napravi! Izlazim."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Opšte"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1196,7 +1213,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr ""
 
@@ -1215,10 +1232,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "standardno"
 
@@ -1379,8 +1397,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1711,14 +1729,14 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1770,13 +1788,17 @@ msgstr ""
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1838,8 +1860,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr ""
 
@@ -1852,11 +1875,12 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr ""
 
@@ -1869,11 +1893,12 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr ""
 
@@ -1882,7 +1907,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr ""
 
@@ -1908,7 +1933,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1963,9 +1988,10 @@ msgstr "Skini"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr ""
 
@@ -1991,8 +2017,8 @@ msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr ""
 
@@ -2004,8 +2030,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Dodaj u prozor za ćaskanje"
 
@@ -2020,8 +2046,8 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr ""
 
@@ -2029,7 +2055,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
@@ -2041,11 +2067,11 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr ""
@@ -2057,8 +2083,8 @@ msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr ""
 
@@ -2124,8 +2150,8 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2151,43 +2177,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr ""
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Ime:                     "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr ""
 
@@ -2196,50 +2236,66 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Sačuvaj 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Sačuvaj pola"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Sačuvaj sve"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Uzmi 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Uzmi pola"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Uzmi sve"
 
@@ -2247,58 +2303,59 @@ msgstr "Uzmi sve"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr ""
 
@@ -2306,30 +2363,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr ""
 
@@ -2337,7 +2394,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2346,202 +2403,206 @@ msgstr "Nivo: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignoriši"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2552,17 +2613,17 @@ msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2576,9 +2637,10 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Ćaskanje"
 
@@ -2590,9 +2652,9 @@ msgstr "Ćaskanje"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2679,10 +2741,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
@@ -2865,14 +2929,17 @@ msgstr ""
 msgid "Road point"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2967,7 +3034,7 @@ msgstr "Izmeni"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2986,7 +3053,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3020,12 +3087,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3536,7 +3605,8 @@ msgstr ""
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3544,11 +3614,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3559,28 +3630,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Boje"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Ukloni boje sa primljenih poruka"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Prikaži listu boja za ćaskanje"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3590,31 +3663,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Dozvoli magiju i sve GM komande na svim karticama za ćaskanje"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Ograniči maksimalan broj karaktera u jednoj liniji za ćaskanje"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3624,11 +3699,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Ograniči maksimalan broj linija za ćaskanje"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3638,16 +3714,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Uključi spašavanje ćaskanja"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3655,31 +3732,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Prikaži istoriju ćaskanja"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3689,11 +3769,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3703,16 +3784,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Sakrij poruke prodavnica"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3724,11 +3806,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3739,17 +3822,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Stavi sva šaputanja u kartice"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3760,11 +3844,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Spasi poruke vezane za magiju u debug kartici"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3773,11 +3858,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Prikaži serverske poruke na debug kartici"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3787,11 +3873,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Uključi karticu za trgovanje"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3800,11 +3887,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3814,11 +3902,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3827,11 +3916,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3841,11 +3931,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Uključi karticu za bitku"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3855,11 +3946,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Prikaži događaje bitke"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3867,11 +3959,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3882,27 +3975,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3911,11 +4006,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3924,11 +4020,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3939,16 +4036,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Ovako izgleda ta boja"
@@ -3960,7 +4059,7 @@ msgstr ""
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr ""
 
@@ -3981,33 +4080,33 @@ msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr ""
 
@@ -4216,9 +4315,10 @@ msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4329,238 +4429,240 @@ msgstr ""
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Prikaži posao"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Spašavanje NPC razgovora"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Režim niskog protoka"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Prikaži pozadinu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4827,13 +4929,14 @@ msgstr "Dozvoli trgovinu"
 msgid "Allow whispers"
 msgstr "Dozvoli šaputanje"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4841,12 +4944,12 @@ msgid "Delete"
 msgstr "Obriši"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Kada se ignoriše:"
 
@@ -4916,30 +5019,31 @@ msgstr ""
 msgid "i"
 msgstr ""
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Stil promenjen"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Zatvori i onda ponovo otvori svoj klijent da bi izmene proradile."
 
@@ -5032,8 +5136,8 @@ msgstr "Ograničen FPS:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Alternativno FPS ograničenje: "
 
@@ -5063,63 +5167,66 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5236,48 +5343,50 @@ msgstr ""
 msgid "max"
 msgstr "maksimalna"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5322,6 +5431,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5367,11 +5477,13 @@ msgstr ""
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5426,208 +5538,218 @@ msgstr ""
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Ko je dostupan"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "KS"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EQU"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Oprema"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Lista predmeta"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr ""
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5657,7 +5779,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
 
@@ -5888,7 +6010,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5904,23 +6026,23 @@ msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5930,27 +6052,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr ""
 
@@ -5972,7 +6095,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6135,12 +6259,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6375,8 +6499,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6411,7 +6536,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6435,6 +6561,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
@@ -6474,6 +6601,7 @@ msgstr ""
 msgid "status bar"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr ""
@@ -6682,13 +6810,14 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6707,23 +6836,46 @@ msgstr ""
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
-#. TRANSLATORS: shop window dialog
-#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
-msgid "Request for Trade"
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
 #: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr ""
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
 #, c-format
-msgid "%s wants to %s %s do you accept?"
+msgid "%s wants to sell %s do you accept?"
+msgstr ""
+
+#. TRANSLATORS: shop window dialog
+#. TRANSLATORS: trade message
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6734,36 +6886,37 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6867,21 +7020,23 @@ msgstr "%s te je pozvao da se pridružiš njihovoj partiji."
 msgid "%s has invited you to join the %s party."
 msgstr "%s te je pozvao da se pridružiš %s partiji."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Prihvati zahtev za partiju"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Nije moguće napraviti partiju. Već se nalaziš u jednoj."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Ime partije"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Izaberi ime svoje partije."
 
@@ -7056,27 +7211,28 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr ""
 
@@ -8528,284 +8684,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8838,103 +9029,116 @@ msgstr ""
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, c-format
+msgid "hungry level %d"
+msgstr ""
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9642,7 +9846,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10187,12 +10391,12 @@ msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 787b17db4..0a03aeb67 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2016-01-03 17:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -36,21 +36,21 @@ msgstr ""
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -66,35 +66,38 @@ msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -129,6 +132,7 @@ msgstr "Guild-namn saknas."
 msgid "Please specify a name."
 msgstr "Var vänlig specificera ett namn."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Enter för att växla chat."
@@ -147,7 +151,8 @@ msgstr "Enter nu, växlar chat."
 msgid "Message now closes chat."
 msgstr "Meddelande nu, stänger chat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -242,7 +247,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -256,8 +262,9 @@ msgstr "Ignorera inkommande bytes-förfrågningar"
 msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -271,6 +278,7 @@ msgstr "Synlig på karta"
 msgid "Human"
 msgstr "Människa"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "undvika"
@@ -351,53 +359,53 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -407,8 +415,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -433,9 +441,9 @@ msgid "Floating bubble"
 msgstr "Floating bubble"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Inställningar"
@@ -467,8 +475,9 @@ msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -532,9 +541,12 @@ msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -545,7 +557,7 @@ msgstr "Ändrar spelserver"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -741,32 +753,37 @@ msgstr "Felaktig uppdaterings-host: %s."
 msgid "Error creating updates directory!"
 msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1196,7 +1213,7 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Återuppliva"
 
@@ -1215,10 +1232,11 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "standard"
 
@@ -1379,8 +1397,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1711,14 +1729,14 @@ msgstr "Skapa Party"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1770,13 +1788,17 @@ msgstr "Trade"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Attackera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1838,8 +1860,9 @@ msgstr "Flytta"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Prata med"
 
@@ -1852,11 +1875,12 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Köp"
 
@@ -1869,11 +1893,12 @@ msgstr "Köp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Sälj"
 
@@ -1882,7 +1907,7 @@ msgstr "Sälj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr ""
 
@@ -1908,7 +1933,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -1963,9 +1988,10 @@ msgstr "Unequip"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -1991,8 +2017,8 @@ msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Kicka från party"
 
@@ -2004,8 +2030,8 @@ msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
@@ -2020,8 +2046,8 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -2029,7 +2055,7 @@ msgstr "Ta bort"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Warpa"
 
@@ -2041,11 +2067,11 @@ msgstr "Rör kamera"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -2057,8 +2083,8 @@ msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
@@ -2124,8 +2150,8 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
@@ -2151,43 +2177,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Namn:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -2196,50 +2236,66 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Lagra"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Lagra 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Lagra hälften"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Ta emot"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2247,58 +2303,59 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2306,30 +2363,30 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Visa fönster"
 
@@ -2337,7 +2394,7 @@ msgstr "Visa fönster"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2346,202 +2403,206 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Släng allt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2552,17 +2613,17 @@ msgid "Basic"
 msgstr "Enkel"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Genvägar"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fönster"
 
@@ -2576,9 +2637,10 @@ msgstr "Emotes"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
@@ -2590,9 +2652,9 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2679,10 +2741,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Party-medlemmar"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Guild-medlemmar"
@@ -2865,14 +2929,17 @@ msgstr "Hemplatskant"
 msgid "Road point"
 msgstr "Väg-märke"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Level: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2967,7 +3034,7 @@ msgstr "Ändra"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -2986,7 +3053,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3020,12 +3087,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3536,7 +3605,8 @@ msgstr "Fönster"
 msgid "Auto hide chat window"
 msgstr "Dölj automagiskt chat-fönstret"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3544,11 +3614,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3559,28 +3630,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Färger"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Ta bort färger från motagna chat-meddelanden"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Visa chat-färglistan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3590,31 +3663,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Kommando"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Tillåt magic och GM kommandon i alla chat-flikar"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Begränsningar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Begränsa max-tecken i chatten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3624,11 +3699,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Begränsa max-rader i chatten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3638,16 +3714,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Loggar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Aktivera chat-logg"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3655,31 +3732,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Aktivera Logg för debug-chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Visa chat-historik"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3689,11 +3769,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Visa online-meddelande för guild"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3703,16 +3784,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Meddelanden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Dölj shop-meddelanden"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3724,11 +3806,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Visa MVP-meddelanden"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3739,17 +3822,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Flikar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Lägg alla viskningar i flikar"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3760,11 +3844,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Logga magic messages i log-tabben"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3773,11 +3858,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Visa servermeddelanden i log-fliken"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3787,11 +3873,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Aktivera bytes-fliken"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3800,11 +3887,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Aktivera GM-flik"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3814,11 +3902,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Aktivera språk-flik"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3827,11 +3916,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Visa alla språk-meddelanden"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3841,11 +3931,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Aktivera battle-flik"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3855,11 +3946,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Visa battle events"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3867,11 +3959,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Ändra storlek på chat-flikarna om det behövs"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3882,27 +3975,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Tid"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Använd lokal tid"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Highlighta ord (separerat med komma)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3911,11 +4006,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3924,11 +4020,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3939,16 +4036,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Så här ser färgerna ut"
@@ -3960,7 +4059,7 @@ msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Fördröjning:"
 
@@ -3981,33 +4080,33 @@ msgstr "Blå:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Statiskt"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Regnbåge"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -4216,9 +4315,10 @@ msgid "Cycle monster targets"
 msgstr "Cycle monsters targets"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4329,239 +4429,241 @@ msgstr "Musrelativa förflyttningar (bra för touch-gränssnitt)"
 msgid "Player"
 msgstr "Spelare"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Visa egen hp-bar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Aktivera quick stats"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Cycle spelarens targets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Visa jobbexp-meddelanden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Visa spelar-popups"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Afk-meddelande"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Visa jobb"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Aktivera attack-filter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Aktivera pickup-filter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Aktivera annonsprotokoll"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Aktivera vikt-notationer"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Shop"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Acceptera sälj/köp erbjudanden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Aktivera shop mode"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "Cycle npc-targets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Logga NPC-dialoger"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Bots support"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Tangentbord"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Upprepningsfördröjning"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Upprepningsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Anpassat upprepningsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "Genvägsknappar"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Proxy-server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Proxy-typ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Proxy-adress:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Aktivera serversideattack"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr "Aktivera dubbleklick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Aktivera bot checker"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 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_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Aktivera debug-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Aktivera OpenGL-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Aktivera inputs-logg"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Lågtrafik-mode"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 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_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Nätverksfördröjning mellan underservrar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Visa bakgrund"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Skärmdensitet överskrids"
 
@@ -4828,13 +4930,14 @@ msgstr "Tillåt byteshandel"
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4842,12 +4945,12 @@ msgid "Delete"
 msgstr "Radera"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Relationer"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
@@ -4917,30 +5020,31 @@ msgstr "NPC font-storlek"
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Namn: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "Copyright:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Temainformation"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Tema ändrat"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringarna ska utföras."
 
@@ -5033,8 +5137,8 @@ msgstr "FPS-begränsning:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Alternativ FPS-begränsning: "
 
@@ -5064,16 +5168,18 @@ msgid "No frame"
 msgstr "Ingen ram"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Ingen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5081,7 +5187,7 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5089,42 +5195,43 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Ändrar till Fullskärm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart behövs för att ändringar ska genomföras."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Ändrar till OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Tillämpar ändringar till OpenGL, behöver omstart."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Anpassad upplösning (exempel: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Skriv in ny upplösning:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Skärmupplösning ändrad"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Vissa fönster kan flyttas på för att passa i lägre upplösning."
 
@@ -5241,48 +5348,50 @@ msgstr "Ambient FX"
 msgid "max"
 msgstr "max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Partikel-detalj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Partikelfysik"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Aktivera gamma-kontroll"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Centrera spelfönster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Tillåt skärmsläckare att starta"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5327,6 +5436,7 @@ msgstr "Spelare: %u/%u"
 msgid "Invited user %s to guild %s."
 msgstr "Bjud in användare %s till guilden %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5372,11 +5482,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr "Portaler: %u/%u"
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Bjud in spelare %s till party."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5431,208 +5543,218 @@ msgstr "Synliga spelare: %d"
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Vem är online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "QE"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Uppdrag"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "KS"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Dödsstatistik"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EQU"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Equipment"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventory"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Cart"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "SKI"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Skills"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "YK"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Visste du att"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Nyckel: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5662,7 +5784,7 @@ msgstr "Antal:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Skapa"
 
@@ -5893,7 +6015,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Spela"
@@ -5909,23 +6031,23 @@ msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Konto %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5940,27 +6062,28 @@ msgstr ""
 "Experience: %u⏎\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Felaktigt lösenord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Skriv in lösenordet för att radera karaktär"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
@@ -5982,7 +6105,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6147,12 +6271,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6385,8 +6509,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6421,7 +6546,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6445,6 +6571,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "health bar"
@@ -6484,6 +6611,7 @@ msgstr "arrows bar"
 msgid "status bar"
 msgstr "status bar"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "job bar"
@@ -6692,13 +6820,14 @@ msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Personlig Shop"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6717,23 +6846,46 @@ msgstr "Visa länkar i annonseringen"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s vill %s %s, accepterar du?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s vill %s %s, accepterar du?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s vill %s %s, accepterar du?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6744,36 +6896,37 @@ msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6877,21 +7030,23 @@ msgstr "%s har bjudit in dig att joina deras party."
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig att joina %s party."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Acceptera Party-invite"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan inte skapa party. Du är redan i ett party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Party-namn"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Välj ditt party-namn."
 
@@ -7068,27 +7223,28 @@ msgstr "Uppdaterar..."
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 Uppdateringsprocessen är inte fullständig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Det är starkt rekommenderat att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1 du försöker senare igen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Färdig"
 
@@ -8545,284 +8701,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr "Strength %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr "Agility %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitality %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dexterity %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr "Luck %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Strength"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Agility"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitality"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Intelligence"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Dexterity"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical Hit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Attack Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Walk Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Attack Range"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Damage per sec."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Inga servrar tillgängliga."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker använda detta konto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Detta konto är redan inloggat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Speed hack upptäckt."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Duplicerad Inloggning."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8855,103 +9046,116 @@ msgstr "Gamla lösenordet är felaktigt."
 msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Guild level: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har ännu inte nått required lvl!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Otillräckligt HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Otillräckligt SP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Du har inga memos!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer money... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan inte använda denna skill med det vapnet!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Du bär för mycket för att kunna göra detta!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9659,7 +9863,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10206,12 +10410,12 @@ msgid "%d minutes"
 msgstr "%d minuter"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d sekund"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 787b17db4..0a03aeb67 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2016-01-03 17:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -36,21 +36,21 @@ msgstr ""
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -66,35 +66,38 @@ msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -129,6 +132,7 @@ msgstr "Guild-namn saknas."
 msgid "Please specify a name."
 msgstr "Var vänlig specificera ett namn."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Enter för att växla chat."
@@ -147,7 +151,8 @@ msgstr "Enter nu, växlar chat."
 msgid "Message now closes chat."
 msgstr "Meddelande nu, stänger chat."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -242,7 +247,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -256,8 +262,9 @@ msgstr "Ignorera inkommande bytes-förfrågningar"
 msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -271,6 +278,7 @@ msgstr "Synlig på karta"
 msgid "Human"
 msgstr "Människa"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "undvika"
@@ -351,53 +359,53 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -407,8 +415,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -433,9 +441,9 @@ msgid "Floating bubble"
 msgstr "Floating bubble"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Inställningar"
@@ -467,8 +475,9 @@ msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -532,9 +541,12 @@ msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -545,7 +557,7 @@ msgstr "Ändrar spelserver"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -741,32 +753,37 @@ msgstr "Felaktig uppdaterings-host: %s."
 msgid "Error creating updates directory!"
 msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
@@ -1196,7 +1213,7 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Återuppliva"
 
@@ -1215,10 +1232,11 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "standard"
 
@@ -1379,8 +1397,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1711,14 +1729,14 @@ msgstr "Skapa Party"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1770,13 +1788,17 @@ msgstr "Trade"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Attackera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1838,8 +1860,9 @@ msgstr "Flytta"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Prata med"
 
@@ -1852,11 +1875,12 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Köp"
 
@@ -1869,11 +1893,12 @@ msgstr "Köp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Sälj"
 
@@ -1882,7 +1907,7 @@ msgstr "Sälj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr ""
 
@@ -1908,7 +1933,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -1963,9 +1988,10 @@ msgstr "Unequip"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -1991,8 +2017,8 @@ msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Kicka från party"
 
@@ -2004,8 +2030,8 @@ msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
@@ -2020,8 +2046,8 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -2029,7 +2055,7 @@ msgstr "Ta bort"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Warpa"
 
@@ -2041,11 +2067,11 @@ msgstr "Rör kamera"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -2057,8 +2083,8 @@ msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
@@ -2124,8 +2150,8 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
@@ -2151,43 +2177,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Namn:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -2196,50 +2236,66 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Lagra"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Lagra 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Lagra hälften"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Ta emot"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2247,58 +2303,59 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2306,30 +2363,30 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Visa fönster"
 
@@ -2337,7 +2394,7 @@ msgstr "Visa fönster"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2346,202 +2403,206 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Släng allt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2552,17 +2613,17 @@ msgid "Basic"
 msgstr "Enkel"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Genvägar"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fönster"
 
@@ -2576,9 +2637,10 @@ msgstr "Emotes"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
@@ -2590,9 +2652,9 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2679,10 +2741,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Party-medlemmar"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Guild-medlemmar"
@@ -2865,14 +2929,17 @@ msgstr "Hemplatskant"
 msgid "Road point"
 msgstr "Väg-märke"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Level: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2967,7 +3034,7 @@ msgstr "Ändra"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -2986,7 +3053,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3020,12 +3087,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3536,7 +3605,8 @@ msgstr "Fönster"
 msgid "Auto hide chat window"
 msgstr "Dölj automagiskt chat-fönstret"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3544,11 +3614,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3559,28 +3630,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Färger"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Ta bort färger från motagna chat-meddelanden"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Visa chat-färglistan"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3590,31 +3663,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Kommando"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Tillåt magic och GM kommandon i alla chat-flikar"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Begränsningar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Begränsa max-tecken i chatten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3624,11 +3699,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Begränsa max-rader i chatten"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3638,16 +3714,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Loggar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Aktivera chat-logg"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3655,31 +3732,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Aktivera Logg för debug-chat"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Visa chat-historik"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3689,11 +3769,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Visa online-meddelande för guild"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3703,16 +3784,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Meddelanden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Dölj shop-meddelanden"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3724,11 +3806,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Visa MVP-meddelanden"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3739,17 +3822,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Flikar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Lägg alla viskningar i flikar"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3760,11 +3844,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Logga magic messages i log-tabben"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3773,11 +3858,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Visa servermeddelanden i log-fliken"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3787,11 +3873,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Aktivera bytes-fliken"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3800,11 +3887,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Aktivera GM-flik"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3814,11 +3902,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Aktivera språk-flik"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3827,11 +3916,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Visa alla språk-meddelanden"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3841,11 +3931,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Aktivera battle-flik"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3855,11 +3946,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Visa battle events"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3867,11 +3959,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Ändra storlek på chat-flikarna om det behövs"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3882,27 +3975,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Tid"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Använd lokal tid"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Highlighta ord (separerat med komma)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3911,11 +4006,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3924,11 +4020,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3939,16 +4036,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Så här ser färgerna ut"
@@ -3960,7 +4059,7 @@ msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Fördröjning:"
 
@@ -3981,33 +4080,33 @@ msgstr "Blå:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Statiskt"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Regnbåge"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -4216,9 +4315,10 @@ msgid "Cycle monster targets"
 msgstr "Cycle monsters targets"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4329,239 +4429,241 @@ msgstr "Musrelativa förflyttningar (bra för touch-gränssnitt)"
 msgid "Player"
 msgstr "Spelare"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Visa egen hp-bar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Aktivera quick stats"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Cycle spelarens targets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Visa jobbexp-meddelanden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Visa spelar-popups"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Afk-meddelande"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Visa jobb"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Aktivera attack-filter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Aktivera pickup-filter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Aktivera annonsprotokoll"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Aktivera vikt-notationer"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Shop"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Acceptera sälj/köp erbjudanden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Aktivera shop mode"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "Cycle npc-targets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Logga NPC-dialoger"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Bots support"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Tangentbord"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Upprepningsfördröjning"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Upprepningsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Anpassat upprepningsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "Genvägsknappar"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Proxy-server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Proxy-typ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Proxy-adress:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Aktivera serversideattack"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr "Aktivera dubbleklick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Aktivera bot checker"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 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_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Aktivera debug-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Aktivera OpenGL-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Aktivera inputs-logg"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Lågtrafik-mode"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 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_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Nätverksfördröjning mellan underservrar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Visa bakgrund"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Skärmdensitet överskrids"
 
@@ -4828,13 +4930,14 @@ msgstr "Tillåt byteshandel"
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4842,12 +4945,12 @@ msgid "Delete"
 msgstr "Radera"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Relationer"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
@@ -4917,30 +5020,31 @@ msgstr "NPC font-storlek"
 msgid "i"
 msgstr "i"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Namn: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "Copyright:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Temainformation"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Tema ändrat"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringarna ska utföras."
 
@@ -5033,8 +5137,8 @@ msgstr "FPS-begränsning:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Alternativ FPS-begränsning: "
 
@@ -5064,16 +5168,18 @@ msgid "No frame"
 msgstr "Ingen ram"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Ingen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5081,7 +5187,7 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5089,42 +5195,43 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Ändrar till Fullskärm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart behövs för att ändringar ska genomföras."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Ändrar till OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Tillämpar ändringar till OpenGL, behöver omstart."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Anpassad upplösning (exempel: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Skriv in ny upplösning:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Skärmupplösning ändrad"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Vissa fönster kan flyttas på för att passa i lägre upplösning."
 
@@ -5241,48 +5348,50 @@ msgstr "Ambient FX"
 msgid "max"
 msgstr "max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Partikel-detalj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Partikelfysik"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Aktivera gamma-kontroll"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Centrera spelfönster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Tillåt skärmsläckare att starta"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5327,6 +5436,7 @@ msgstr "Spelare: %u/%u"
 msgid "Invited user %s to guild %s."
 msgstr "Bjud in användare %s till guilden %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5372,11 +5482,13 @@ msgstr "Nav"
 msgid "Portals: %u/%u"
 msgstr "Portaler: %u/%u"
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Bjud in spelare %s till party."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5431,208 +5543,218 @@ msgstr "Synliga spelare: %d"
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Vem är online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "QE"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Uppdrag"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "KS"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Dödsstatistik"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EQU"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Equipment"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "INV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventory"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Cart"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "SKI"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Skills"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOC"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "YK"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Visste du att"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Nyckel: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5662,7 +5784,7 @@ msgstr "Antal:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Skapa"
 
@@ -5893,7 +6015,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Spela"
@@ -5909,23 +6031,23 @@ msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Konto %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5940,27 +6062,28 @@ msgstr ""
 "Experience: %u⏎\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Felaktigt lösenord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Skriv in lösenordet för att radera karaktär"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
@@ -5982,7 +6105,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6147,12 +6271,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6385,8 +6509,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6421,7 +6546,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6445,6 +6571,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "health bar"
@@ -6484,6 +6611,7 @@ msgstr "arrows bar"
 msgid "status bar"
 msgstr "status bar"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "job bar"
@@ -6692,13 +6820,14 @@ msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Personlig Shop"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6717,23 +6846,46 @@ msgstr "Visa länkar i annonseringen"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s vill %s %s, accepterar du?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s vill %s %s, accepterar du?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s vill %s %s, accepterar du?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6744,36 +6896,37 @@ msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6877,21 +7030,23 @@ msgstr "%s har bjudit in dig att joina deras party."
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig att joina %s party."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Acceptera Party-invite"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan inte skapa party. Du är redan i ett party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Party-namn"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Välj ditt party-namn."
 
@@ -7068,27 +7223,28 @@ msgstr "Uppdaterar..."
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 Uppdateringsprocessen är inte fullständig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Det är starkt rekommenderat att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1 du försöker senare igen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Färdig"
 
@@ -8545,284 +8701,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr "Strength %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr "Agility %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitality %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dexterity %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr "Luck %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Strength"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Agility"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Vitality"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Intelligence"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Dexterity"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical Hit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Attack Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Walk Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Attack Range"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Damage per sec."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Inga servrar tillgängliga."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker använda detta konto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Detta konto är redan inloggat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Speed hack upptäckt."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Duplicerad Inloggning."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8855,103 +9046,116 @@ msgstr "Gamla lösenordet är felaktigt."
 msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Guild level: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har ännu inte nått required lvl!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Otillräckligt HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Otillräckligt SP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Du har inga memos!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer money... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan inte använda denna skill med det vapnet!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Du bär för mycket för att kunna göra detta!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9659,7 +9863,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10206,12 +10410,12 @@ msgid "%d minutes"
 msgstr "%d minuter"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d sekund"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
diff --git a/po/tr.po b/po/tr.po
index 405136c6d..57875fbfd 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
@@ -38,21 +38,21 @@ msgstr "Dosya yüklendi"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -68,35 +68,38 @@ msgid "Cache cleaned"
 msgstr "Bellek temizlendi"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client çalışma süresi: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Kaynak resimleri:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Edinilmiş kaynak resimleri:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Çevre değişkenleri yığıldı"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Config bilgisi şuraya yüklendi:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Server configi şuraya yüklendi:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Log kayıtları şuraya yüklendi:"
 
@@ -131,6 +134,7 @@ msgstr "Guild adı eksik."
 msgid "Please specify a name."
 msgstr "Lütfen bir isim belirtin."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Enter tuşu sohbeti açar/kapatır."
@@ -149,7 +153,8 @@ msgstr "Enter tuşu sohbeti şimdi sonlandırır."
 msgid "Message now closes chat."
 msgstr "Mesaj sohbeti şimdi kapatır."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -244,7 +249,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -258,8 +264,9 @@ msgstr "Gelen takas istekleri görmezden geliniyor."
 msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -273,6 +280,7 @@ msgstr "Haritada görünür"
 msgid "Human"
 msgstr "İnsan"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "kaçınıldı"
@@ -353,53 +361,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "iş"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Takip et: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Takip iptal edildi."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Taklit: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Taklit iptal edildi"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "%s görüyorsun"
@@ -409,8 +417,8 @@ msgstr "%s görüyorsun"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
@@ -435,9 +443,9 @@ msgid "Floating bubble"
 msgstr "Yüzen balon"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Ayarlar"
@@ -469,8 +477,9 @@ msgid "About"
 msgstr "Hakkında"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Yardım"
@@ -534,9 +543,12 @@ msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -547,7 +559,7 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -740,32 +752,37 @@ msgstr "Geçersiz sunucu güncellemesi: %s."
 msgid "Error creating updates directory!"
 msgstr "Güncelleme klasörleri yaratılırken hata oluştu!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Hata: %s bulunamadı ve yaratılamıyor! Çıkış yapılıyor."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "ya da"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Hata ayıklama"
@@ -1195,7 +1212,7 @@ msgstr "Mesaj"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Dirilt"
 
@@ -1218,10 +1235,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "varsayılan"
 
@@ -1382,8 +1400,8 @@ msgstr "Kocaman (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(varsayılan)"
 
@@ -1714,14 +1732,14 @@ msgstr "Parti kur"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1773,13 +1791,17 @@ msgstr "Takas"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Saldırı"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1841,8 +1863,9 @@ msgstr "Taşı"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Konuş"
 
@@ -1855,11 +1878,12 @@ msgstr "Konuş"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Satın Al"
 
@@ -1872,11 +1896,12 @@ msgstr "Satın Al"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Sat"
 
@@ -1885,7 +1910,7 @@ msgstr "Sat"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Yorum ekle"
 
@@ -1911,7 +1936,7 @@ msgstr "Saldırı listesine ekle"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Gözmezden gelinenler listesine ekle"
 
@@ -1966,9 +1991,10 @@ msgstr "Çıkar"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Yeniden adlandır"
 
@@ -1994,8 +2020,8 @@ msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Partiden at"
 
@@ -2007,8 +2033,8 @@ msgstr "Topla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
@@ -2023,8 +2049,8 @@ msgstr "Harita itemi"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -2032,7 +2058,7 @@ msgstr "Kaldır"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Dönüştür"
 
@@ -2044,11 +2070,11 @@ msgstr "Hareket kamerası"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Kıyafetler"
@@ -2060,8 +2086,8 @@ msgid "Clear outfit"
 msgstr "Kıyafetlerin hepsini çıkart"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Büyüler"
 
@@ -2127,8 +2153,8 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Panoya kopyala"
 
@@ -2154,43 +2180,57 @@ msgstr "Kilidi aç"
 msgid "Lock"
 msgstr "Kilitle"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Harita işaretini tekrar adlandır "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "İsim:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Oyuncu yorumu             "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Yorum:                        "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Takasa ekle"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "10 tanesini takasa ekle"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Yarısını takasa ekle"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Tamamını takasa ekle-1"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Tamamını takasa ekle"
 
@@ -2199,50 +2239,66 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Sakla"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Sakla 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Yarısını sakla"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Tamamını sakla-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Tamamını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Geri al"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Geri al 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Yarısını geri al"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Tamamını geri al-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Tamamını geri al"
 
@@ -2250,58 +2306,59 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr ""
 
@@ -2309,30 +2366,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr ""
 
@@ -2340,7 +2397,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2349,202 +2406,206 @@ msgstr "Seviye: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Görmezden gel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Gruba davet et"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2555,17 +2616,17 @@ msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2579,9 +2640,10 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Sohbet"
 
@@ -2593,9 +2655,9 @@ msgstr "Sohbet"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2682,10 +2744,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
@@ -2868,14 +2932,17 @@ msgstr ""
 msgid "Road point"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2970,7 +3037,7 @@ msgstr "Dünzenle"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -2989,7 +3056,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3023,12 +3090,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3539,7 +3608,8 @@ msgstr ""
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3547,11 +3617,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3562,28 +3633,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Renkler"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Gelen sohbet mesajlarından renkleri kaldır"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Sohbet renkleri listesini göster"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3593,32 +3666,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 "Bütün sohbet pencerelerinde büyü ve GM komutlarının kullanılmasına izin ver"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Sohbet satırında bulunacak en yüksek harf sayısını sınırla"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3628,11 +3703,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Sohbette görünülecek en yüksek satır sayısını sınırla"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3642,16 +3718,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Sohbet günlüklemeyi etkinleştir"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3659,31 +3736,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Sohbet geçmişini göster"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3693,11 +3773,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3707,16 +3788,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Alışveriş mesajlarını gizle"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3728,11 +3810,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3743,17 +3826,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Bütün fısıltıları sekmelere koy"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3764,11 +3848,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Büyü mesajlarını hata ayıklama sekmesinde kayıt altına al"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3777,11 +3862,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Sunucu mesajlarını hata ayıklama sekmesinde göster"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3791,11 +3877,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Takas penceresini etkinleştir"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3804,11 +3891,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3818,11 +3906,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3831,11 +3920,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3845,11 +3935,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Savaş sekmesini etkinleştir"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3859,11 +3950,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Savaş etkinliklerini göster"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3871,11 +3963,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3886,27 +3979,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3915,11 +4010,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3928,11 +4024,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3943,16 +4040,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Renk bu şekilde görünür"
@@ -3964,7 +4063,7 @@ msgstr "Tip:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Gecikme:"
 
@@ -3985,33 +4084,33 @@ msgstr "Mavi:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Sabit"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Darbe"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Gökkuşağı"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -4220,9 +4319,10 @@ msgid "Cycle monster targets"
 msgstr "Canavar hedeflerini sırayla değiştir"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4333,238 +4433,240 @@ msgstr ""
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Kendi HP çubuğunu göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Hızlı istatistikleri etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Oyuncu hedeflerini sırayla değiştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "İş tecrübe mesajlarını göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Oyuncu açılır pencerelerini göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "İşi göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Toplama filtresini etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Ağırlık bildirimlerini etkinleştir"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Mağaza"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Alım/Satım isteklerini kabul et"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Mağaza modunu etkinleştir"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "NPC diyaloglarını kaydet"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Sunucu yan saldırılarını etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Bot Kontrolörünü etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Hata ayıklama modunu etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Düşük trafik modu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Arkaplanı göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4831,13 +4933,14 @@ msgstr "Takasa izin ver"
 msgid "Allow whispers"
 msgstr "Fısıltılara izin ver"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4845,12 +4948,12 @@ msgid "Delete"
 msgstr "Sil"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Görmezden gelirken:"
 
@@ -4920,30 +5023,31 @@ msgstr ""
 msgid "i"
 msgstr ""
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Tema Değiştirildi"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Değişikliklerin etkinleşmesi için istemcinizi tekrar başlatın."
 
@@ -5036,8 +5140,8 @@ msgstr "FPS limiti:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Alternatif FPS limiti: "
 
@@ -5067,63 +5171,66 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Hiç"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Pencere görünümüne geçilemedi ve eski hale geri dönüş başarısız oldu!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Tam ekrana geçilemedi ve eski hale geri dönüş başarısız oldu!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Tam Ekrana Geçiliyor"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Değişikliklerin etkili olması için yeniden başlatma gerekli."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "OpenGL'ye Değiştiriliyor"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL değişikliklerini uygulamak için yeniden başlatma gereklidir."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Özel çözünürlük (örnek: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Yeni çözünürlük gir:                 "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Ekran Çözünürlüğü Değiştirildi"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Bazı pencereler düşürülmüş çözünürlüğe uyması için taşınmış olabilir."
 
@@ -5240,48 +5347,50 @@ msgstr "Çevresel grafikler"
 msgid "max"
 msgstr "en yüksek"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Partikül detayı"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5326,6 +5435,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr "%s kullanıcısı %s loncasına davet edildi."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5371,11 +5481,13 @@ msgstr "Navigasyon"
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "%s adlı oyuncu gruba davet edildi."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5430,208 +5542,218 @@ msgstr ""
 msgid "ONL"
 msgstr "KO"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Kimler Online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "Öİ"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Öldürme istatistikleri"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "DRM"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Durum"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "EKP"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Ekipman"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "ENV"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Envanter"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "YTN"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Yetenekler"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "SOS"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Sosyal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "KY"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "BY"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "AYR"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Tuş: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5661,7 +5783,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Oluştur"
 
@@ -5892,7 +6014,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Oyna"
@@ -5908,23 +6030,23 @@ msgid "Info"
 msgstr "Bilgi"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5934,27 +6056,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr ""
 
@@ -5976,7 +6099,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6139,12 +6263,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6377,8 +6501,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6413,7 +6538,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6437,6 +6563,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
@@ -6476,6 +6603,7 @@ msgstr ""
 msgid "status bar"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr ""
@@ -6684,13 +6812,14 @@ msgid "Reset Windows"
 msgstr "Pencereleri sıfırla"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Kişisel Mağaza"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6709,23 +6838,46 @@ msgstr "Duyuruda linkleri göster"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Takas isteği yolla"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6736,36 +6888,37 @@ msgid "Up"
 msgstr "Yukarı"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Mevcut yetenek puanları: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Yetenek Seti %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Yetenek %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6869,21 +7022,23 @@ msgstr "%s seni gruplarına davet etti."
 msgid "%s has invited you to join the %s party."
 msgstr "%s seni %s grubuna davet etti."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Grup Davetini Kabul et"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Grup kuramazsın. Zaten bir gruba dahilsin"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Grup Adı"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Grubunun adını seç."
 
@@ -7060,27 +7215,28 @@ msgstr "Güncelleniyor..."
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 Güncelleme işlemi tamamlanamadı."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Şiddetle tavsiye edilir ki"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1 daha sonra tekrar deneyiniz."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -8532,284 +8688,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Güç"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Çeviklik"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Yaşam Gücü"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Zeka"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Maharet"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Şans"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Başka birisi bu hesabı kullanmaya çalışıyor."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Zaten bu hesaba bağlanıldı."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8842,103 +9033,116 @@ msgstr "Eski şifre hatalı."
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, c-format
+msgid "hungry level %d"
+msgstr ""
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9646,7 +9850,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10192,12 +10396,12 @@ msgid "%d minutes"
 msgstr "%d dakikalar"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d saniye"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyeler"
diff --git a/po/uk.po b/po/uk.po
index 021aff309..22aa58111 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
@@ -39,21 +39,21 @@ msgstr "Файл завантажено"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -69,35 +69,38 @@ msgid "Cache cleaned"
 msgstr "Кеш прибрано"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Час безперервної роботи клієнта: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "Зображень:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "Вилучених зображень:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "Змінні середовища збережені"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "Завантажений конфіг:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "Завантажена конфігурація сервера:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "Завантажений лог:"
 
@@ -134,6 +137,7 @@ msgstr "Не вистачає назви гільдії."
 msgid "Please specify a name."
 msgstr "Будь ласка, вкажіть гравця."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "Enter перемикає на чат."
@@ -152,7 +156,8 @@ msgstr "Enter тепер перемикає на вікно чату."
 msgid "Message now closes chat."
 msgstr "Тепер повідомлення закриватиме вікно чату."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -247,7 +252,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -261,8 +267,9 @@ msgstr "Ігнорування вхідних пропозицій торгів�
 msgid "Accepting incoming trade requests"
 msgstr "Приймання вхідних пропозицій торгівлі"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -276,6 +283,7 @@ msgstr "Видимий на мапі"
 msgid "Human"
 msgstr "Людина"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "ухилення"
@@ -357,53 +365,53 @@ msgstr[2] "Ви підняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "досвід"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "робота"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "Йти слідом за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "Слідкування відмінено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "Імітація: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "Імітацію відмінено"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "Ти бачиш %s"
@@ -413,8 +421,8 @@ msgstr "Ти бачиш %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "Остаточно ігнорувати"
 
@@ -439,9 +447,9 @@ msgid "Floating bubble"
 msgstr "Плаваюча бульбашка"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Налаштування"
@@ -473,8 +481,9 @@ msgid "About"
 msgstr "Про програму"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Довідка"
@@ -538,9 +547,12 @@ msgid "Changing game servers"
 msgstr "Зміна ігрового серверу..."
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -551,7 +563,7 @@ msgstr "Зміна ігрового серверу..."
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -746,32 +758,37 @@ msgstr "Невідомий сервер оновлення: %s."
 msgid "Error creating updates directory!"
 msgstr "Неможливо створити теку для оновлень!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Помилка: тека %s не існує і не може бути створена! Виходимо."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd файл_джерела рядок_кольору файл_призначення"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "або"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_рядків_кольору файл_призначення"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "Загальне"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Зневадження"
@@ -1201,7 +1218,7 @@ msgstr "Повідомлення"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "Опритомнити"
 
@@ -1222,10 +1239,11 @@ msgstr "Ви навантажені менш, ніж на половину. Те
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "за замовчуванням"
 
@@ -1386,8 +1404,8 @@ msgstr "Величезний (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(за замовчуванням)"
 
@@ -1718,14 +1736,14 @@ msgstr "Створити групу"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1777,13 +1795,17 @@ msgstr "Торгівля"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "Атака"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1845,8 +1867,9 @@ msgstr "Рух"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Діалог"
 
@@ -1859,11 +1882,12 @@ msgstr "Діалог"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Придбати"
 
@@ -1876,11 +1900,12 @@ msgstr "Придбати"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Продати"
 
@@ -1889,7 +1914,7 @@ msgstr "Продати"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "Додати примітку"
 
@@ -1915,7 +1940,7 @@ msgstr "Додати до списку атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "Ігнорувати тип мобу"
 
@@ -1970,9 +1995,10 @@ msgstr "Зняти"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "Перейменувати"
 
@@ -1998,8 +2024,8 @@ msgstr "Гравці"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "Виштовхати з групи"
 
@@ -2011,8 +2037,8 @@ msgstr "Підняти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "Додати до чату"
 
@@ -2027,8 +2053,8 @@ msgstr "Елемент карти"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "Видалити"
 
@@ -2036,7 +2062,7 @@ msgstr "Видалити"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Телепорт"
 
@@ -2048,11 +2074,11 @@ msgstr "Рухати камеру"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "Швидке спорядження"
@@ -2064,8 +2090,8 @@ msgid "Clear outfit"
 msgstr "Видалити швидке спорядження"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Заклинання"
 
@@ -2131,8 +2157,8 @@ msgstr "Залишити"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "Внести в буфер обміну"
 
@@ -2158,43 +2184,57 @@ msgstr "Відімкнути"
 msgid "Lock"
 msgstr "Зафіксувати"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "Перейменувати            "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "Ім'я:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Примітка до гравця        "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Примітка:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "Додати до торгівлі"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "Додати до торгівлі 10"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "Додати половину до торгівлі"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "Додати все окрім одного"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "Додати всю кількість"
 
@@ -2203,50 +2243,66 @@ msgstr "Додати всю кількість"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Зберегти"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "Зберегти 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "Зберегти половину"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "Зберегти все окрім одного"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "Зберегти всю кількість"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "Вилучити"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "Вилучити 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "Вилучити половину"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "Вилучити все окрім одного"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "Вилучити всю кількість"
 
@@ -2254,58 +2310,59 @@ msgstr "Вилучити всю кількість"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Використати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "Скинути значення комірців"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "Сховати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "Показати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "Скинути Жовтий рядок"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Додати до чату"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "Пріоритет вище"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "Пріоритет нижче"
 
@@ -2313,30 +2370,30 @@ msgstr "Пріоритет нижче"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "Роздягнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "Копіювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "Вставити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "Відвідати посилання"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "Показати вікно"
 
@@ -2344,7 +2401,7 @@ msgstr "Показати вікно"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2353,202 +2410,206 @@ msgstr "Рівень: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "Зневажати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ігнорувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "В чорний список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "Позначити супротивником"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "Стерти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "Приятелювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "Повернути з ігнору"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "Іти слідом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "Купувати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "Продати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "Запросити до групи"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr "Ввійти до чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "Показати спорядження"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "Видалити зі списку підбирання"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "Додати до списку підбирання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "Зняти захист"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "Захистити предмет"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "Кинути..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "Кинути все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "Кинути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "ГМ команди"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "Перевірити IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "Відвідати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "Викликати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "Виштовхати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2559,17 +2620,17 @@ msgid "Basic"
 msgstr "Загальне"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Швидкі клавіші"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Вікна"
 
@@ -2583,9 +2644,10 @@ msgstr "Смайлики"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Чат"
 
@@ -2597,9 +2659,9 @@ msgstr "Чат"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2686,10 +2748,12 @@ msgstr "Гомункул"
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "Члени групи"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "Члени гільдії"
@@ -2872,14 +2936,17 @@ msgstr "Межа домашньої позиції"
 msgid "Road point"
 msgstr "Точка шляху"
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr "Рівень: %u"
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2974,7 +3041,7 @@ msgstr "Редагувати"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Рівень: %d"
@@ -2993,7 +3060,7 @@ msgstr "Тип: %s"
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr "Невідомий"
 
@@ -3027,12 +3094,14 @@ msgstr "Пастка"
 msgid "Unknown:"
 msgstr "Невідомо:"
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Мана: -%d"
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr "Дальність: %d"
@@ -3543,7 +3612,8 @@ msgstr "Вікно"
 msgid "Auto hide chat window"
 msgstr "Автоматично ховати вікно"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3551,11 +3621,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr "Захищати фокус чату"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3566,28 +3637,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Кольори"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "Видаляти забарвлення вхідних повідомлень чату"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "Показувати список кольорів чату"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3597,31 +3670,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Команди"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Дозволити магію та ГМ команди у всіх вкладках чату"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "Ліміти"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "Обмежити кількість символів у повідомлені чату"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3631,11 +3706,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "Обмежити кількість рядків вікна чату"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3645,16 +3721,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "Логи"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "Ввімкнути лог чату"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3662,31 +3739,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr "Ввімкнути лог зневадження"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "Показувати історію чату"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr "Сповіщати про появлення членів групи"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3696,11 +3776,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr "Сповіщати про появлення членів гільдії"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3710,16 +3791,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "Повідомлення"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "Не показувати робочі повідомлення крамниці"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3731,11 +3813,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr "Показувати MVP повідомлення"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3746,17 +3829,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "Вкладки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "Шепіт (приватне спілкування) в окремих вкладках"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3767,11 +3851,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "Лог магії у вкладці зневадження"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3780,11 +3865,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "Показувати сповіщення сервера у вкладці зневадження"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3794,11 +3880,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "Ввімкнути вкладку торгівлі"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3807,11 +3894,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr "Ввімкнути ГМ вкладку"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3821,11 +3909,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr "Ввімкнути вкладку для мови"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3834,11 +3923,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr "Показувати повідомлення на всіх мовах"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3848,11 +3938,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "Ввімкнути вкладку бійки"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3862,11 +3953,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "Показувати події бійки"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3874,11 +3966,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr "Змінювати розмір вкладок чату за потребою"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3889,27 +3982,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "Час"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "Вживати місцевий час"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr "Підсвічувані слова (відокремлені комами)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3918,11 +4013,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr "Ігнорування глобальні повідомлення від (відокремити комами)"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3931,11 +4027,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr "Показати кнопку смайликів у чаті"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3946,16 +4043,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr "Показувати серверне привітання"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "Ось, як виглядає цей колір"
@@ -3967,7 +4066,7 @@ msgstr "Тип:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "Затримка:"
 
@@ -3988,33 +4087,33 @@ msgstr "Синій:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "Статичне"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "Пульсуюче"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "Веселка"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "Спектр"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "Прозорість:"
 
@@ -4223,9 +4322,10 @@ msgid "Cycle monster targets"
 msgstr "Прокручувати мобів по колу"
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4336,238 +4436,240 @@ msgstr "Рух відносно миші (добре для тач інтерф�
 msgid "Player"
 msgstr "Гравець"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "Показувати свій рівень здоров'я"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "Дозволити швидку зміну характеристик"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr "Прокручувати гравців по колу"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "Показувати досвід роботи"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "Показувати бульбашки від гравців"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr "Повідомлення режиму відсутності"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "Показувати роботу"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "Ввімкнути фільтр атаки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr "Ввімкнути фільтр підбирання"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr "Дозволити трансляцію стану клієнта"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr "Ввімкнути підтримку улюбленців"
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr "Повідомляти про вагове перенавантаження"
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "Крамниця"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "Приймати пропозиції купівлі/продажу"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "Ввімкнути режим крамниці"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr "Прокручувати NPC по колу"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "Зберігати діалог з NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "Підтримка ботів"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ввімкнути підтримку guild-боту та вимкнути серверну підтримку гільдій"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr "Клавіатура"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr "Затримка перед повторенням"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr "Інтервал повторення"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr "Користувацький Інтервал"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr "Клавіші"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr "Проксі сервер"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr "Тип проксі"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr "Проксі хост:порт"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "Ввімкнути серверну атаку"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr "Не видавати адресу підтримки при помилці"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr "Ввімкнути підтримку подвійних кліків"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "Ввімкнути перевірку ботів"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Ввімкнути захист від глючних серверів (не вимикати!)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "Ввімкнути лог зневадження"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr "Не вносити в лог мережеві пакети"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr "Ввімкнути OpenGL лог"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr "Ввімкнути лог введення"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr "Завантажили лог файл"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "Режим кешування гравців"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Вживати FBO для скріншотів (тільки OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr "Тека скріншотів"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr "Встановити затримку з'єднання між підсерверами"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "Показати фон"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr "Корекція роздільності екрану"
 
@@ -4839,13 +4941,14 @@ msgstr "Дозволити торгівлю"
 msgid "Allow whispers"
 msgstr "Дозволити шепіт (приватне спілкування)"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4853,12 +4956,12 @@ msgid "Delete"
 msgstr "Видалити"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "Стосунки"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "Коли ігнорується:"
 
@@ -4928,30 +5031,31 @@ msgstr "Розмір шрифта NPC"
 msgid "i"
 msgstr "Інфо"
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr "Ім'я: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr "Авторське право:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr "Про тему"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "Дата модифікації"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "Перезавантажте клієнт, щоб застосувати зміни."
 
@@ -5044,8 +5148,8 @@ msgstr "Обмеження частоти кадрів:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr "Альтернативний FPS ліміт: "
 
@@ -5075,63 +5179,66 @@ msgid "No frame"
 msgstr "Без рамки"
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "Ні"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Не вдалося встановити режим і відновити попередній!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Не вдалося встановити режим і відновити попередній!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "Перемикання на повний екран"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "Потрібно перезапустити для застосування змін."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "Перемикання OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "Потрібно перезапустити для застосування змін OpenGL."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Користовацька роздільність (наприклад, 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "Введіть нову роздільність:           "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "Розподільчу здатність встановлено"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Вікна можуть змінювати позиції при зменшені розміру клієнту."
 
@@ -5248,48 +5355,50 @@ msgstr "Ефекти оточення"
 msgid "max"
 msgstr "максимальний"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "Деталізація ефектів частинок"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr "Фізика частинок"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr "Гама"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr "Ввімкнути корегування гами"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr "Вертикальна синхронізація"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr "Змістити вікно до центра"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr "Дозволити скрінсейвер"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr "Скріншоти"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr "Додати водяний знак до скріншоту"
 
@@ -5334,6 +5443,7 @@ msgstr "Гравців: %u/%u"
 msgid "Invited user %s to guild %s."
 msgstr "Запрошено гравця %s до гільдії %s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5379,11 +5489,13 @@ msgstr "Нав"
 msgid "Portals: %u/%u"
 msgstr "Телепортів: %u/%u"
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Запрошено гравця %s до групи."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5438,208 +5550,218 @@ msgstr "Видимих гравців: %d"
 msgid "ONL"
 msgstr "ХО"
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "Хто онлайн"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr "ДОВ"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr "КВ"
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Квести"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr "СА"
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "Статистика атак"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "Смайлики"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr "ЧАТ"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr "СТН"
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "Стан"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr "СПР"
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "Спорядження"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr "СУМ"
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "Сумка"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr "Візок"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr "МАП"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "ВМІ"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Вміння"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr "СУС"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr "Спільнота"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr "ШП"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr "ЗК"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr "ДР"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "ЧВВ"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "Чи вам відомо"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr "КРА"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr "ШС"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr "ОН"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr "Оновлення"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr "БА"
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Банк"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr "ЗНВ"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr "ВІК"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "НАЛ"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "Клавіша: %s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Рахунок у банку: %s"
@@ -5669,7 +5791,7 @@ msgstr "Кількість:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Створити"
 
@@ -5900,7 +6022,7 @@ msgstr "Пароль"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Увійти"
@@ -5916,23 +6038,23 @@ msgid "Info"
 msgstr "Відомості"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr "Акаунт %s"
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr "Будь ласка, встановіть новий пін код"
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr "Будь ласка, вкажіть нове ім'я"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5947,27 +6069,28 @@ msgstr ""
 "Досвід: %u\n"
 "Кошти: %s"
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "Неправильний пароль!"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "Вкажіть пароль для видалення персонажу"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "Пароль:"
 
@@ -5989,7 +6112,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "%s'ів улюбленець"
@@ -6152,12 +6276,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6392,8 +6516,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6428,7 +6553,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6452,6 +6578,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "здоров'я"
@@ -6491,6 +6618,7 @@ msgstr "стріли"
 msgid "status bar"
 msgstr "рядок стану"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr "рівень роботи"
@@ -6699,13 +6827,14 @@ msgid "Reset Windows"
 msgstr "Скинути налаштування вікон"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "Особиста крамниця"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6724,23 +6853,47 @@ msgstr "Посилання у анонсі"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+#, fuzzy
+msgid "error: player busy"
+msgstr "Рух нагору"
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s бажає %s %s, підтримуєте пропозицію?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s бажає %s %s, підтримуєте пропозицію?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Запит на торгівлю"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s бажає %s %s, підтримуєте пропозицію?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6751,36 +6904,37 @@ msgid "Up"
 msgstr "Вище"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Балів вмінь: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Група вмінь %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Вміння %d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Невдале вміння: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6884,21 +7038,23 @@ msgstr "%s запрошує вас приєднатись до їх групи."
 msgid "%s has invited you to join the %s party."
 msgstr "%s запрошує вас до групи %s."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "Запрошення до групи прийнято"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "Неможливо створити групу, бо ви все є членом однієї"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr "Група"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "Оберіть назву групи."
 
@@ -7073,27 +7229,28 @@ msgstr "Оновлення..."
 msgid "Connecting..."
 msgstr "З'єднуюсь..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr "Показати всі новини (може бути повільним)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процес поновлення не завершився."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настійно рекомендовано"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr "##1  спробувати ще раз пізніше."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "Завершено"
 
@@ -8547,284 +8704,319 @@ msgstr "Персонаж не знайдено."
 msgid "Failed to delete character."
 msgstr "Неможливо видалити персонаж."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr "Неможливо використати вміння у цій місцевості."
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr "Неможливо використати цей предмет у цій місцевості."
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr "Неможливо вдягнути. Неправильний рівень."
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr "Неможливо вжити. Неправильний рівень."
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr "Чекаємо на результат."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Неможливо відправити повідомлення, канал %s не існує."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Неможливо відкрити канал, канал %s не існує."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr "Сила %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr "Спритність %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr "Витривалість %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr "Інтелект %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr "Вправність %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr "Талан %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "Відключений від серверу!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "Сила"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "Спритність"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "Витривалість"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "Інтелект"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "Вправність"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "Талан"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "Захист"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr "Маг. напад"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr "Маг. захист"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "Точність (%)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "Ухиляння (%)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "Критичний удар (%)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "Затримка атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "Затримка руху"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "Дальність атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "Ушкодження за секунду."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr "Карма"
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr "Манери"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Аутентифікація не вдалася."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Немає доступних серверів."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Хтось інший намагається використати цей акаунт."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Цей акаунт все знаходиться у грі."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Виявлено перевищення швидкісних лімітів."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr "Сервер повний."
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr "Даруйте, але в вас недостатньо віку."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Дубльований логін."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr "Забагато з'єднань з того ж самого IP."
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr "Не оплачуване."
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr "Оплату призупинено."
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr "Оплату змінено."
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr "Оплачувано інший IP."
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr "Оплатіть кімнату."
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr "ГМ відключив вас від серверу."
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr "Японський бан."
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr "Залишились інші акаунти."
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr "Неправильна адреса."
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr "Перевищення з'єднань з однієї адреси."
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr "Перевищення з'єднань з однієї адреси."
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr "Пам'ять."
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr "Коректний HAN."
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr "Обмеження IP доступу."
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr "Забагато персонажів."
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr "IP-адреса заблокована."
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr "Некоректний розмір паролю."
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr "Недозволена раса."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Невідома помилка з'єднання."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr "Мапу не знайдено."
 
@@ -8857,103 +9049,116 @@ msgstr "Старий пароль некоректний."
 msgid "New password too short."
 msgstr "Новий пароль замалий."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "Рівень гільдії: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Невідома похибка вміння: %d"
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У вас недостатній рівень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Недостатньо здоров'я!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Недостатньо мани!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Записи порожні!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Не можна зробити це прямо зараз!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Здається, в вас замало грошей... ;C"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Не можна вжити вміння з цим типом зброї!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Вам потрібен інший червоний самоцвіт!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Вам потрібний інший синій самоцвіт!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Ви забагато тримаєте, щоб це зробити!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9661,7 +9866,8 @@ msgstr "Не вдалося завести улюбленця."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+#, fuzzy
+msgid "Pet caught."
 msgstr "Улюбленця обрано."
 
 #. TRANSLATORS: notification message
@@ -10208,12 +10414,12 @@ msgid "%d minutes"
 msgstr "%d хвилин"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d секунда"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9f1f7deca..88e05b82c 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-23 22:06+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -43,21 +43,21 @@ msgstr ""
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -73,35 +73,38 @@ msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -136,6 +139,7 @@ msgstr "公会名称缺失."
 msgid "Please specify a name."
 msgstr "请指定一个名称."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "<回车>键促发聊天."
@@ -154,7 +158,8 @@ msgstr "<回车>键现在促发聊天."
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -249,7 +254,8 @@ msgstr ""
 msgid "Server config value: %s"
 msgstr ""
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr ""
 
@@ -263,8 +269,9 @@ msgstr "忽略新进的交易请求"
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -278,6 +285,7 @@ msgstr "在地图上可见"
 msgid "Human"
 msgstr ""
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "躲闪"
@@ -357,53 +365,53 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -413,8 +421,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -439,9 +447,9 @@ msgid "Floating bubble"
 msgstr "流动的泡沫"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "设置"
@@ -473,8 +481,9 @@ msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
@@ -538,9 +547,12 @@ msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -551,7 +563,7 @@ msgstr "正在更改游戏服务器"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -744,32 +756,37 @@ msgstr ""
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "调试"
@@ -1199,7 +1216,7 @@ msgstr "讯息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr ""
 
@@ -1218,10 +1235,11 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "默认"
 
@@ -1382,8 +1400,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1714,14 +1732,14 @@ msgstr "建立"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1773,13 +1791,17 @@ msgstr "交易"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "攻击"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1841,8 +1863,9 @@ msgstr "移动"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "说话"
 
@@ -1855,11 +1878,12 @@ msgstr "说话"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "购买"
 
@@ -1872,11 +1896,12 @@ msgstr "购买"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "出售"
 
@@ -1885,7 +1910,7 @@ msgstr "出售"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "发表评论"
 
@@ -1911,7 +1936,7 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1966,9 +1991,10 @@ msgstr "卸下装备"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "重命名"
 
@@ -1994,8 +2020,8 @@ msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "踢从党"
 
@@ -2007,8 +2033,8 @@ msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "加入聊天"
 
@@ -2023,8 +2049,8 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr ""
 
@@ -2032,7 +2058,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
@@ -2044,11 +2070,11 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "套装"
@@ -2060,8 +2086,8 @@ msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "法术"
 
@@ -2127,8 +2153,8 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2154,43 +2180,57 @@ msgstr ""
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "名称：                   "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr ""
 
@@ -2199,50 +2239,66 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -2250,58 +2306,59 @@ msgstr "检索所有"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr ""
 
@@ -2309,30 +2366,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr ""
 
@@ -2340,7 +2397,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2349,202 +2406,206 @@ msgstr "等级：%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2555,17 +2616,17 @@ msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "快捷键"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
@@ -2579,9 +2640,10 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "聊天"
 
@@ -2593,9 +2655,9 @@ msgstr "聊天"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2682,10 +2744,12 @@ msgstr ""
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
@@ -2868,14 +2932,17 @@ msgstr ""
 msgid "Road point"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2970,7 +3037,7 @@ msgstr "编辑"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
@@ -2989,7 +3056,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3023,12 +3090,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3539,7 +3608,8 @@ msgstr ""
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3547,11 +3617,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3562,28 +3633,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "颜色"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr "从收到的聊天消息中删除颜色"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr "显示聊天颜色列表"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3593,31 +3666,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "命令"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "允许在所有聊天标签中使用魔法和GM命令"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr "限制"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr "文字数量超过限制"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3627,11 +3702,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr "限制聊天的最大"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3641,16 +3717,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr "日志"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr "启用聊天记录"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3658,31 +3735,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr "显示聊天记录"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3692,11 +3772,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3706,16 +3787,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr "消息"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr "隐藏商店消息"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3727,11 +3809,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3742,17 +3825,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr "标签"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr "将所有密语放于标签夜"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3763,11 +3847,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr "在调试页记录魔法信息"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3776,11 +3861,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr "在调试选项卡中显示服务器的消息"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3790,11 +3876,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr "标签"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3803,11 +3890,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3817,11 +3905,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3830,11 +3919,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3844,11 +3934,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr "启用战斗“选项卡"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3858,11 +3949,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr "显示的战斗事件"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3870,11 +3962,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3885,27 +3978,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr "时间"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr "使用本地时间"
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3914,11 +4009,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3927,11 +4023,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3942,16 +4039,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "这就是该色彩看起来的样子"
@@ -3963,7 +4062,7 @@ msgstr "类型:"
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr "延迟:"
 
@@ -3984,33 +4083,33 @@ msgstr "蓝色:"
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr "静止的"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr "脉冲"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr "彩虹"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr "色谱"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr "阿尔法:"
 
@@ -4217,9 +4316,10 @@ msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4330,238 +4430,240 @@ msgstr ""
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr "显示自己的HP栏"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr "启用快速统计"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr "显示工作EXP消息"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr "显示球员弹出窗口"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr "显示工作"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr "启用攻击过滤器"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "商店"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr "接受出售/购买请求"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr "启用商店模式"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr "挂机支持"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr "显示背景"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4828,13 +4930,14 @@ msgstr "允许交易"
 msgid "Allow whispers"
 msgstr "允许密语"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4842,12 +4945,12 @@ msgid "Delete"
 msgstr "删除"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr "关系"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "当忽略时:"
 
@@ -4917,30 +5020,31 @@ msgstr ""
 msgid "i"
 msgstr ""
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr "主题更改"
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效."
 
@@ -5033,8 +5137,8 @@ msgstr "FPS限制:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -5064,63 +5168,66 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr "w"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切换到窗口模式，并恢复旧的模式，也没有失败!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:                 "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5237,48 +5344,50 @@ msgstr "环境音效"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr "l"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5323,6 +5432,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr "邀请用户%s加入公会%s."
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5368,11 +5478,13 @@ msgstr ""
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr "邀请用户%s加入团队."
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5427,208 +5539,218 @@ msgstr ""
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr "谁在线"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr ""
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr "杀敌统计"
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr "表情符号"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "状态"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr ""
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "装备"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr ""
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "物品栏"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr "技能"
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "技能"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr "YK"
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr "你知道吗"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr "按键：%s"
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5658,7 +5780,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立"
 
@@ -5889,7 +6011,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "开始"
@@ -5905,23 +6027,23 @@ msgid "Info"
 msgstr "信息"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5931,27 +6053,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr "输入密码:"
 
@@ -5973,7 +6096,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6136,12 +6260,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6372,8 +6496,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6408,7 +6533,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6432,6 +6558,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
@@ -6471,6 +6598,7 @@ msgstr ""
 msgid "status bar"
 msgstr "状态栏"
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr ""
@@ -6679,13 +6807,14 @@ msgid "Reset Windows"
 msgstr "重置窗口"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr "个人商店"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6704,23 +6833,46 @@ msgstr "显示在公布的联系"
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, fuzzy, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr "%s想要%s %s 你接受吗?"
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
+#, fuzzy, c-format
+msgid "%s wants to sell %s do you accept?"
+msgstr "%s想要%s %s 你接受吗?"
+
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/windows/shopwindow.cpp:970
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s想要%s %s 你接受吗?"
-
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6731,36 +6883,37 @@ msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6864,21 +7017,23 @@ msgstr "%s已经邀请你加入他们的帮会."
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s."
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr "选择n的名称."
 
@@ -7053,27 +7208,28 @@ msgstr "更新..."
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "已完成"
 
@@ -8527,284 +8683,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr "删除角色失败."
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "力量"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "敏捷"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "生命"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "智慧"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "敏捷"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "幸运"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr "防御"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr "步行延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr "攻击范围"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr "每秒伤害."
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "身份验证失败."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "没有可用的服务器."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "别人尝试使用该帐户."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "此帐户已登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "检测速度劈."
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "重复登录."
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "未知的连接错误."
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8837,103 +9028,116 @@ msgstr "旧密码不正确."
 msgid "New password too short."
 msgstr "新密码太短."
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "工会等级: %d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9641,7 +9845,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10186,12 +10390,12 @@ msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 54529c3e5..3bc0e11b9 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: 2016-01-03 19:26+0300\n"
+"POT-Creation-Date: 2016-01-04 16:11+0300\n"
 "PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
@@ -37,21 +37,21 @@ msgstr "檔案上載成功"
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
-#: src/gui/widgets/tabs/setup_theme.cpp:313
-#: src/gui/widgets/tabs/setup_theme.cpp:349
-#: src/gui/widgets/tabs/setup_video.cpp:252
-#: src/gui/widgets/tabs/setup_video.cpp:280
-#: src/gui/widgets/tabs/setup_video.cpp:398
-#: src/gui/widgets/tabs/setup_video.cpp:414
+#: src/gui/widgets/tabs/setup_theme.cpp:314
+#: src/gui/widgets/tabs/setup_theme.cpp:350
+#: src/gui/widgets/tabs/setup_video.cpp:253
+#: src/gui/widgets/tabs/setup_video.cpp:281
+#: src/gui/widgets/tabs/setup_video.cpp:400
+#: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -67,35 +67,38 @@ msgid "Cache cleaned"
 msgstr "緩存清理成功"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1191 src/actions/actions.cpp:1197
+#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
 #, c-format
 msgid "Client uptime: %s"
 msgstr "客戶端已開啟: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1254 src/actions/actions.cpp:1263
+#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
 msgid "Resource images:"
 msgstr "來源影像:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1257 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
 msgid "Resource orphaned images:"
 msgstr "來源孤立影像:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1358
+#: src/actions/actions.cpp:1362
 msgid "Environment variables dumped"
 msgstr "環境變量轉儲成功"
 
-#: src/actions/actions.cpp:1470
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1475
 msgid "Uploaded config into:"
 msgstr "已把配置上傳至:"
 
-#: src/actions/actions.cpp:1479
+#. TRANSLATORS: upload config chat message
+#: src/actions/actions.cpp:1485
 msgid "Uploaded server config into:"
 msgstr "已把伺服器配置上傳至:"
 
-#: src/actions/actions.cpp:1488
+#. TRANSLATORS: upload log chat message
+#: src/actions/actions.cpp:1495
 msgid "Uploaded log into:"
 msgstr "已把日誌上傳至:"
 
@@ -130,6 +133,7 @@ msgstr "欠缺公會名稱."
 msgid "Please specify a name."
 msgstr "請指定一個名字."
 
+#. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:428
 msgid "Return toggles chat."
 msgstr "確認鍵切換聊天."
@@ -148,7 +152,8 @@ msgstr "確認鍵現在會切換聊天."
 msgid "Message now closes chat."
 msgstr "訊息現在會關閉聊天."
 
-#: src/actions/chat.cpp:600
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:601
 #, c-format
 msgid "equipped hat %s."
 msgstr "已準備帽子 %s."
@@ -243,7 +248,8 @@ msgstr "配置數值:%s"
 msgid "Server config value: %s"
 msgstr "伺服器配置數值:%s"
 
-#: src/actions/pets.cpp:110
+#. TRANSLATORS: dialog header
+#: src/actions/pets.cpp:111
 msgid "Rename your pet"
 msgstr "重新命名你的寵物"
 
@@ -257,8 +263,9 @@ msgstr "正在忽略傳入的交易請求"
 msgid "Accepting incoming trade requests"
 msgstr "正在接受傳入的交易請求"
 
+#. TRANSLATORS: settings tab name
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr "快速"
 
@@ -272,6 +279,7 @@ msgstr "在地圖上可見"
 msgid "Human"
 msgstr "人類"
 
+#. TRANSLATORS: dodge or miss message in attacks
 #: src/being/being.cpp:665
 msgid "dodge"
 msgstr "閃避"
@@ -351,53 +359,53 @@ msgstr[0] "你拾取了 %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1089
-#: src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
+#: src/being/localplayer.cpp:1116
 msgid "xp"
 msgstr "經驗值"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1093 src/being/localplayer.cpp:1099
-#: src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1106
 msgid "job"
 msgstr "勞動值"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1125
 msgid "hp"
 msgstr "生命值"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1134
 msgid "mana"
 msgstr "法力值"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2208
+#: src/being/localplayer.cpp:2209
 #, c-format
 msgid "Follow: %s"
 msgstr "跟隨: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2214 src/being/localplayer.cpp:2239
+#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
 msgid "Follow canceled"
 msgstr "已取消跟隨."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2224
+#: src/being/localplayer.cpp:2225
 #, c-format
 msgid "Imitation: %s"
 msgstr "模仿:%s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2230 src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
 msgid "Imitation canceled"
 msgstr "已取消模仿."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2594
+#: src/being/localplayer.cpp:2595
 #, c-format
 msgid "You see %s"
 msgstr "你看到 %s"
@@ -407,8 +415,8 @@ msgstr "你看到 %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2399
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2403
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -433,9 +441,9 @@ msgid "Floating bubble"
 msgstr "浮動的泡泡"
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:177
+#: src/client.cpp:831 src/dyetool/client.cpp:478 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "設定"
@@ -467,8 +475,9 @@ msgid "About"
 msgstr "關於"
 
 #. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:72
+#: src/client.cpp:846 src/dyetool/client.cpp:493 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "說明"
@@ -532,9 +541,12 @@ msgid "Changing game servers"
 msgstr "正在轉換遊戲伺服器"
 
 #. TRANSLATORS: error dialog header
+#. TRANSLATORS: error message header
 #. TRANSLATORS: change email error header
 #. TRANSLATORS: change password error header
 #. TRANSLATORS: char creation error
+#. TRANSLATORS: error header
+#. TRANSLATORS: edit server dialog error header
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
@@ -545,7 +557,7 @@ msgstr "正在轉換遊戲伺服器"
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
-#: src/gui/windows/charselectdialog.cpp:300
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
@@ -738,32 +750,37 @@ msgstr "無效的更新主機:%s."
 msgid "Error creating updates directory!"
 msgstr "創建更新的目錄時遇到錯誤!"
 
+#. TRANSLATORS: directory creation error
 #: src/dirs.cpp:532 src/dirs.cpp:553
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "錯誤:%s 不存在且無法創建!正在退出."
 
-#: src/dyetool/dyemain.cpp:47
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:48
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "or"
 
-#: src/dyetool/dyemain.cpp:49
+#. TRANSLATORS: command line help
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2198
+#. TRANSLATORS: chat tab name
+#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:163
+#: src/game.cpp:271 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "調試"
@@ -1193,7 +1210,7 @@ msgstr "訊息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
 msgid "Revive"
 msgstr "復活"
 
@@ -1212,10 +1229,11 @@ msgstr "您在攜帶少於體重一半的物品.你可以回復生命值了."
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
+#. TRANSLATORS: equipment window tab
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:669
+#: src/gui/windows/equipmentwindow.cpp:670
 msgid "default"
 msgstr "默認"
 
@@ -1376,8 +1394,8 @@ msgstr "巨型 (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2029
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默認)"
 
@@ -1708,14 +1726,14 @@ msgstr "選擇隊伍"
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
 #: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1767 src/gui/popups/popupmenu.cpp:1804
-#: src/gui/popups/popupmenu.cpp:1855 src/gui/popups/popupmenu.cpp:1897
-#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:2008
-#: src/gui/popups/popupmenu.cpp:2086 src/gui/popups/popupmenu.cpp:2120
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2168
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2215
-#: src/gui/popups/popupmenu.cpp:2233 src/gui/popups/popupmenu.cpp:2261
-#: src/gui/popups/popupmenu.cpp:2577 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
+#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1767,13 +1785,17 @@ msgstr "交易"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
 #: src/gui/popups/popupmenu.cpp:832 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
 msgstr "攻擊"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: whisper to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
 #: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
 #: src/gui/popups/popupmenu.cpp:481
 msgid "Whisper"
@@ -1835,8 +1857,9 @@ msgstr "移動"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
+#. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "對話"
 
@@ -1849,11 +1872,12 @@ msgstr "對話"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2429
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "購買"
 
@@ -1866,11 +1890,12 @@ msgstr "購買"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2441
+#. TRANSLATORS: npc context menu item
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:153
+#: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "出售"
 
@@ -1879,7 +1904,7 @@ msgstr "出售"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2539
+#: src/gui/popups/popupmenu.cpp:2543
 msgid "Add comment"
 msgstr "添加評論"
 
@@ -1905,7 +1930,7 @@ msgstr "加至攻擊列表"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
 msgid "Add to ignore list"
 msgstr "加至忽略列表"
 
@@ -1960,9 +1985,10 @@ msgstr "卸下裝備"
 #. TRANSLATORS: pet rename item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
 msgid "Rename"
 msgstr "重新命名"
 
@@ -1988,8 +2014,8 @@ msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2510
 msgid "Kick from party"
 msgstr "從隊伍踢出"
 
@@ -2001,8 +2027,8 @@ msgstr "拿起物品"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1763
-#: src/gui/popups/popupmenu.cpp:1841 src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
+#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
 msgid "Add to chat"
 msgstr "加至對話"
 
@@ -2017,8 +2043,8 @@ msgstr "地圖物件"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2082
-#: src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Remove"
 msgstr "清除"
 
@@ -2026,7 +2052,7 @@ msgstr "清除"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:638 src/gui/popups/popupmenu.cpp:667
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "傳送"
 
@@ -2038,11 +2064,11 @@ msgstr "移動鏡頭"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
 msgstr "裝備"
@@ -2054,8 +2080,8 @@ msgid "Clear outfit"
 msgstr "清除裝備"
 
 #. TRANSLATORS: popup menu header
-#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:124
+#. TRANSLATORS: long button name for spells window.
+#: src/gui/popups/popupmenu.cpp:727 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "咒語"
 
@@ -2121,8 +2147,8 @@ msgstr "離開"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2185
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
+#: src/gui/popups/popupmenu.cpp:2233
 msgid "Copy to clipboard"
 msgstr "複製至剪貼板"
 
@@ -2148,43 +2174,57 @@ msgstr "解鎖"
 msgid "Lock"
 msgstr "鎖定"
 
-#: src/gui/popups/popupmenu.cpp:1061
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1062
 msgid "Rename map sign          "
 msgstr "清除地圖標誌             "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1065
 msgid "Name:                    "
 msgstr "名字:                    "
 
-#: src/gui/popups/popupmenu.cpp:1081
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "玩家評語                  "
 
+#. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1083
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "評語:                         "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1656
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr "加至交易"
 
-#: src/gui/popups/popupmenu.cpp:1664
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1668
 msgid "Add to trade 10"
 msgstr "把 10 加至交易"
 
-#: src/gui/popups/popupmenu.cpp:1669
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr "把 一半 加至交易"
 
-#: src/gui/popups/popupmenu.cpp:1673
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1677
 msgid "Add to trade all-1"
 msgstr "把 全部-1 加至交易"
 
-#: src/gui/popups/popupmenu.cpp:1677
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1681
 msgid "Add to trade all"
 msgstr "把 全部 加至交易"
 
@@ -2193,50 +2233,66 @@ msgstr "把 全部 加至交易"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/popups/popupmenu.cpp:1837
-#: src/gui/popups/popupmenu.cpp:1878 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
+#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:892 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "儲存"
 
-#: src/gui/popups/popupmenu.cpp:1693
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1697
 msgid "Store 10"
 msgstr "儲存 10"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store half"
 msgstr "儲存 一半"
 
-#: src/gui/popups/popupmenu.cpp:1702
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all except one item to storage
+#: src/gui/popups/popupmenu.cpp:1706
 msgid "Store all-1"
 msgstr "儲存 全部-1"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1710
 msgid "Store all"
 msgstr "儲存 全部"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1716 src/gui/windows/inventorywindow.cpp:266
+#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
 #: src/gui/windows/inventorywindow.cpp:290
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/popups/popupmenu.cpp:1724
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Retrieve 10"
 msgstr "取回 10"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve half"
 msgstr "取回 一半"
 
-#: src/gui/popups/popupmenu.cpp:1733
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1737
 msgid "Retrieve all-1"
 msgstr "取回 全部-1"
 
-#: src/gui/popups/popupmenu.cpp:1737
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1741
 msgid "Retrieve all"
 msgstr "取回 全部"
 
@@ -2244,58 +2300,59 @@ msgstr "取回 全部"
 #. TRANSLATORS: use item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
+#. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1798 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
 #: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:164 src/gui/windows/skilldialog.cpp:336
-#: src/gui/windows/skilldialog.cpp:510 src/gui/windows/skilldialog.cpp:595
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
+#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1897
 msgid "Clear drop window"
 msgstr "清除掉下視窗"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/popups/popupmenu.cpp:1985
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Hide"
 msgstr "隱藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
 msgid "Show"
 msgstr "顯示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Open yellow bar settings"
 msgstr "開啟黃色欄設定"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2001
+#: src/gui/popups/popupmenu.cpp:2005
 msgid "Reset yellow bar"
 msgstr "重設黃色欄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2005 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "複製至對話"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2045 src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move up"
 msgstr "往上移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2051 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
 msgid "Move down"
 msgstr "往下移動"
 
@@ -2303,30 +2360,30 @@ msgstr "往下移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
 msgid "Undress"
 msgstr "脫衣"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2165
 msgid "Copy"
 msgstr "複製"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Paste"
 msgstr "貼上"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Open link"
 msgstr "開啟連結"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2204
 msgid "Show window"
 msgstr "顯示視窗"
 
@@ -2334,7 +2391,7 @@ msgstr "顯示視窗"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2343,202 +2400,206 @@ msgstr "等級:%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2257
+#: src/gui/popups/popupmenu.cpp:2261
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
 msgid "Disregard"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2342
-#: src/gui/popups/popupmenu.cpp:2381 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
 msgid "Black list"
 msgstr "加至黑名單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
 msgid "Set as enemy"
 msgstr "設為冤家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2360 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/popups/popupmenu.cpp:2387
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2391
 msgid "Erase"
 msgstr "擦去"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2329
 msgid "Be friend"
 msgstr "設為朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2336 src/gui/popups/popupmenu.cpp:2354
-#: src/gui/popups/popupmenu.cpp:2366 src/gui/popups/popupmenu.cpp:2375
-#: src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Unignore"
 msgstr "取消忽略"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2412
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Follow"
 msgstr "跟隨"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2420
 msgid "Imitate"
 msgstr "模仿"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
 msgid "Buy (?)"
 msgstr "購買 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2447 src/gui/popups/popupmenu.cpp:2462
+#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
 msgid "Sell (?)"
 msgstr "出售 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
 msgid "Invite to party"
 msgstr "邀請至隊伍"
 
-#: src/gui/popups/popupmenu.cpp:2524
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2528
 #, c-format
 msgid "Join chat %s"
 msgstr "加入對話 %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Show Items"
 msgstr "顯示物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2550
+#: src/gui/popups/popupmenu.cpp:2554
 msgid "Remove from pickup list"
 msgstr "從拾起清單中移除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2559
 msgid "Add to pickup list"
 msgstr "加至拾起清單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Unprotect item"
 msgstr "取消保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2613
+#: src/gui/popups/popupmenu.cpp:2617
 msgid "Protect item"
 msgstr "保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2643 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:902
 msgid "Drop..."
 msgstr "丟棄..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Drop all"
 msgstr "丟棄全部"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:905
+#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:907
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "GM commands"
 msgstr "GM命令"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Check ip"
 msgstr "檢查IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2679
+#: src/gui/popups/popupmenu.cpp:2683
 msgid "Goto"
 msgstr "到"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2686
 msgid "Recall"
 msgstr "召回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2694
 msgid "Kick"
 msgstr "踢走"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2698 src/gui/popups/popupmenu.cpp:2702
-#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2718
 #, c-format
 msgid "Mute %d"
 msgstr "靜音 %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2719 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2739
 #, c-format
 msgid "Unmute %d"
 msgstr "取消靜音 %d"
 
+#. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
+#. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
 msgstr ""
@@ -2549,17 +2610,17 @@ msgid "Basic"
 msgstr "基本"
 
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:120
+#. TRANSLATORS: long button name for shortcuts window.
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "捷徑"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:328
-#: src/gui/windowmenu.cpp:172 src/input/pages/windows.cpp:34
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "視窗"
 
@@ -2573,9 +2634,10 @@ msgstr "表情"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
+#. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
+#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "聊天"
 
@@ -2587,9 +2649,9 @@ msgstr "聊天"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:265
-#: src/gui/widgets/tabs/setup_other.cpp:350
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -2676,10 +2738,12 @@ msgstr "小矮人"
 msgid "Skill unit"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr "隊伍成員"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr "公會成員"
@@ -2862,14 +2926,17 @@ msgstr ""
 msgid "Road point"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:133
+#. TRANSLATORS: character level
+#: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
+#. TRANSLATORS: character money
+#. TRANSLATORS: money label
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:696 src/gui/windows/statuswindow.cpp:69
+#: src/gui/widgets/characterdisplay.cpp:140
+#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
@@ -2964,7 +3031,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:506
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2983,7 +3050,7 @@ msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:679
 msgid "Unknown"
 msgstr ""
 
@@ -3017,12 +3084,14 @@ msgstr ""
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:160
+#. TRANSLATORS: skill mana
+#: src/gui/widgets/skillinfo.cpp:162
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:166
+#. TRANSLATORS: skill range
+#: src/gui/widgets/skillinfo.cpp:170
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3533,7 +3602,8 @@ msgstr ""
 msgid "Auto hide chat window"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:52
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:53
 msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
@@ -3541,11 +3611,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:57
+#: src/gui/widgets/tabs/setup_chat.cpp:58
 msgid "Protect chat focus"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:58
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:60
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
@@ -3556,28 +3627,30 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
-#: src/gui/widgets/tabs/setup_chat.cpp:65
+#: src/gui/widgets/tabs/setup_chat.cpp:67
 #: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:70
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:69
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:72
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:74
+#: src/gui/widgets/tabs/setup_chat.cpp:77
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:75
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
@@ -3587,31 +3660,33 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:83
+#: src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:86
+#: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:87
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:98
 msgid "Limits"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:101
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:97
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
 "Limits how many characters will be shown in longest lines of text displayed "
 "in chat.\n"
@@ -3621,11 +3696,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:110
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:105
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
 "Limits how many lines chat will keep in scrollback buffer. Chat keeps "
 "specified number of last lines of text. Oldest lines exceeding this limit "
@@ -3635,16 +3711,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:113
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Logs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:116
+#: src/gui/widgets/tabs/setup_chat.cpp:123
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:117
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:125
 msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
@@ -3652,31 +3729,34 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:123
+#: src/gui/widgets/tabs/setup_chat.cpp:131
 msgid "Enable debug chat Log"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:124
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:137
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:129
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
 "If this setting enabled, client will load old chat tabs content from logs on "
 "startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:134
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Show party online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:135
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
@@ -3686,11 +3766,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:141
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Show guild online messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:142
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
@@ -3700,16 +3781,17 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:149
+#: src/gui/widgets/tabs/setup_chat.cpp:161
 msgid "Messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:153
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
 "If this setting enabled, no messages related to built-in ManaPlus shop will "
 "be displayed in chat. Disable this setting if you want to see shop-related "
@@ -3721,11 +3803,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:162
+#: src/gui/widgets/tabs/setup_chat.cpp:175
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:163
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:177
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
@@ -3736,17 +3819,18 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
-#: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:61
+#: src/gui/widgets/tabs/setup_chat.cpp:184 src/input/pages/chat.cpp:61
 #: src/input/pages/windows.cpp:202
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:173
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:174
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
 "If this setting enabled, all whispers (private messages) will be placed in "
 "separate tabs, separate tab for each player. If this setting disabled, all "
@@ -3757,11 +3841,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:182
+#: src/gui/widgets/tabs/setup_chat.cpp:197
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
 "If this setting is enabled, spell invocation will be shown in Debug tab. If "
 "disabled, it will be shown in General tab instead.\n"
@@ -3770,11 +3855,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:189
+#: src/gui/widgets/tabs/setup_chat.cpp:205
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:190
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
 "If this setting is enabled, server messages will be shown in Debug tab of "
 "chat. If disabled, server messages will appear in General chat instead.\n"
@@ -3784,11 +3870,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:198
+#: src/gui/widgets/tabs/setup_chat.cpp:215
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:199
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:217
 msgid ""
 "Enables trade tab. Trade tab is basically some filter. Messages containing "
 "words typical for trades will go to Trade tab. This will make General tab "
@@ -3797,11 +3884,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:206
+#: src/gui/widgets/tabs/setup_chat.cpp:224
 msgid "Enable gm tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:207
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
 "If enabled, GM tab will appear in chat. It displays text related GM "
 "activity.\n"
@@ -3811,11 +3899,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:213
+#: src/gui/widgets/tabs/setup_chat.cpp:232
 msgid "Enable language tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:214
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
 "If this feature enabled, language tab will appear if server supports this "
 "feature.\n"
@@ -3824,11 +3913,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:220
+#: src/gui/widgets/tabs/setup_chat.cpp:240
 msgid "Show all languages messages"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:221
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
 "If this setting enabled and server supports different chats for different "
 "languages, you will see messages for all languages, regardless of your "
@@ -3838,11 +3928,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:229
+#: src/gui/widgets/tabs/setup_chat.cpp:250
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:230
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
 "If this setting enabled, Battle tab will appear in chat. This tab will "
 "contain messages related to battles, like damage and experience gain, if "
@@ -3852,11 +3943,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:237
+#: src/gui/widgets/tabs/setup_chat.cpp:259
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:238
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:261
 msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
@@ -3864,11 +3956,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:244
+#: src/gui/widgets/tabs/setup_chat.cpp:267
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:245
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
 "If this feature enabled, text in chat will be automatically adjusted to "
 "adapt to appearance of chat input field when you typing message and when "
@@ -3879,27 +3972,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:256
+#: src/gui/widgets/tabs/setup_chat.cpp:280
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:259
+#: src/gui/widgets/tabs/setup_chat.cpp:283
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:260
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:285
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:268
+#: src/gui/widgets/tabs/setup_chat.cpp:293
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:269
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:295
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -3908,11 +4003,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:275
+#: src/gui/widgets/tabs/setup_chat.cpp:301
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:276
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:303
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -3921,11 +4017,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:310
 msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:284
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:312
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -3936,16 +4033,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:292
+#: src/gui/widgets/tabs/setup_chat.cpp:320
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#. TRANSLATORS: settings description
+#: src/gui/widgets/tabs/setup_chat.cpp:322
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
 
+#. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr ""
@@ -3957,7 +4056,7 @@ msgstr ""
 
 #. TRANSLATORS: colors tab. label.
 #: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:357
+#: src/gui/widgets/tabs/setup_colors.cpp:360
 msgid "Delay:"
 msgstr ""
 
@@ -3978,33 +4077,33 @@ msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:427
+#: src/gui/widgets/tabs/setup_colors.cpp:430
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:111
-#: src/gui/widgets/tabs/setup_colors.cpp:429
+#: src/gui/widgets/tabs/setup_colors.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:432
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:116
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:118
 #: src/gui/widgets/tabs/setup_colors.cpp:121
-#: src/gui/widgets/tabs/setup_colors.cpp:431
+#: src/gui/widgets/tabs/setup_colors.cpp:124
+#: src/gui/widgets/tabs/setup_colors.cpp:434
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:351
+#: src/gui/widgets/tabs/setup_colors.cpp:354
 msgid "Alpha:"
 msgstr ""
 
@@ -4211,9 +4310,10 @@ msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
+#. TRANSLATORS: long button name for map window.
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
 #: src/gui/windows/minimap.cpp:122
 msgid "Map"
@@ -4324,238 +4424,240 @@ msgstr ""
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:248
+#: src/gui/widgets/tabs/setup_other.cpp:249
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:258
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Enable weight notifications"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for shop window.
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:273 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:237
 msgid "Shop"
 msgstr "商店"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:276
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:288
+#: src/gui/widgets/tabs/setup_other.cpp:290
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:297
+#: src/gui/widgets/tabs/setup_other.cpp:299
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:300
+#: src/gui/widgets/tabs/setup_other.cpp:302
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:306
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Enable manamarket bot support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:318
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:322
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:326
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:334
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:337
+#: src/gui/widgets/tabs/setup_other.cpp:339
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:343
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:345
+#: src/gui/widgets/tabs/setup_other.cpp:347
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:355
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:359
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:363
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Log unimplimented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:387
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:391
+#: src/gui/widgets/tabs/setup_other.cpp:393
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:395 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:397 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:404
+#: src/gui/widgets/tabs/setup_other.cpp:406
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:410
+#: src/gui/widgets/tabs/setup_other.cpp:412
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:419
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:421
+#: src/gui/widgets/tabs/setup_other.cpp:423
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:426
+#: src/gui/widgets/tabs/setup_other.cpp:428
 msgid "Screen density override"
 msgstr ""
 
@@ -4822,13 +4924,14 @@ msgstr "允許交易"
 msgid "Allow whispers"
 msgstr "允許密語"
 
+#. TRANSLATORS: relation dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
@@ -4836,12 +4939,12 @@ msgid "Delete"
 msgstr "刪除"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:82
+#: src/gui/widgets/tabs/setup_relations.cpp:83
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:107
+#: src/gui/widgets/tabs/setup_relations.cpp:108
 msgid "When ignoring:"
 msgstr "當忽略時:"
 
@@ -4911,30 +5014,31 @@ msgstr ""
 msgid "i"
 msgstr ""
 
-#. TRANSLATORS: theme info dialog
+#. TRANSLATORS: theme name
 #: src/gui/widgets/tabs/setup_theme.cpp:243
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:244
+#. TRANSLATORS: theme copyright
+#: src/gui/widgets/tabs/setup_theme.cpp:245
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:310
+#: src/gui/widgets/tabs/setup_theme.cpp:311
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_theme.cpp:346
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:394
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_theme.cpp:348
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:413
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -5027,8 +5131,8 @@ msgstr ""
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:81
 #: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:324
-#: src/gui/widgets/tabs/setup_video.cpp:467
+#: src/gui/widgets/tabs/setup_video.cpp:325
+#: src/gui/widgets/tabs/setup_video.cpp:469
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -5058,63 +5162,66 @@ msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
+#. TRANSLATORS: video settings label value
+#. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:322
-#: src/gui/widgets/tabs/setup_video.cpp:451
-#: src/gui/widgets/tabs/setup_video.cpp:464
+#: src/gui/widgets/tabs/setup_video.cpp:123
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:453
+#: src/gui/widgets/tabs/setup_video.cpp:466
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:228
+#: src/gui/widgets/tabs/setup_video.cpp:229
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:235
+#: src/gui/widgets/tabs/setup_video.cpp:236
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:250
+#: src/gui/widgets/tabs/setup_video.cpp:251
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:278
+#: src/gui/widgets/tabs/setup_video.cpp:279
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_video.cpp:395
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5231,48 +5338,50 @@ msgstr ""
 msgid "max"
 msgstr "最大"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:174
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/widgets/tabs/setup_visual.cpp:195
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:196
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:191
+#: src/gui/widgets/tabs/setup_visual.cpp:192
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:206
+#: src/gui/widgets/tabs/setup_visual.cpp:207
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:211
+#: src/gui/widgets/tabs/setup_visual.cpp:212
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:216
+#: src/gui/widgets/tabs/setup_visual.cpp:217
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_visual.cpp:221
+#: src/gui/widgets/tabs/setup_visual.cpp:222
 msgid "Screenshots"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:223
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:225
 msgid "Add water mark into screenshots"
 msgstr ""
 
@@ -5317,6 +5426,7 @@ msgstr ""
 msgid "Invited user %s to guild %s."
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialguildtab.h:102
 #, c-format
 msgid "Guild %s quit requested."
@@ -5362,11 +5472,13 @@ msgstr ""
 msgid "Portals: %u/%u"
 msgstr ""
 
+#. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/socialpartytab.h:86
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
+#. TRANSLATORS: tab in social window
 #: src/gui/widgets/tabs/socialpartytab.h:103
 #, c-format
 msgid "Party %s quit requested."
@@ -5421,208 +5533,218 @@ msgstr ""
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#. TRANSLATORS: long button name for who is online window.
+#: src/gui/windowmenu.cpp:70
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:72
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
+#. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr ""
 
+#. TRANSLATORS: long button name for kill stats window.
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:49
+#: src/gui/windowmenu.cpp:82 src/gui/windows/killstats.cpp:49
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:80
+#. TRANSLATORS: long button name for emotes window.
+#: src/gui/windowmenu.cpp:85
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:87
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
+#: src/gui/windowmenu.cpp:96
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:91
+#. TRANSLATORS: long button name for status window.
+#: src/gui/windowmenu.cpp:98
 msgid "Status"
 msgstr "狀態"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:100
 msgid "EQU"
 msgstr ""
 
+#. TRANSLATORS: long button name for equipment window.
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:239
 msgid "Equipment"
 msgstr "裝備"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:104
 msgid "INV"
 msgstr ""
 
+#. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:148
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
 #: src/inventory.cpp:310
 msgid "Inventory"
 msgstr "背包"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:108
 msgid "CA"
 msgstr ""
 
+#. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:235
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
 #: src/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:112
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:120
 msgid "SKI"
 msgstr ""
 
+#. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "技能"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:114
+#: src/gui/windowmenu.cpp:126
 msgid "SOC"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for social window.
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:116 src/gui/windows/socialwindow.cpp:54
+#: src/gui/windowmenu.cpp:128 src/gui/windows/socialwindow.cpp:54
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:118
+#: src/gui/windowmenu.cpp:130
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:134
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:138
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:143
 msgid "YK"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#. TRANSLATORS: long button name for did you know window.
+#: src/gui/windowmenu.cpp:145
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:148
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:141
+#: src/gui/windowmenu.cpp:153
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:158
 msgid "UP"
 msgstr ""
 
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:148
+#. TRANSLATORS: long button name for updates window.
+#: src/gui/windowmenu.cpp:160
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:163
 msgid "BA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for bank window.
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:153 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:165 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:168
 msgid "MA"
 msgstr ""
 
-#. TRANSLATORS: full button name
+#. TRANSLATORS: long button name for mail window.
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
 #: src/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:173
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:170
+#: src/gui/windowmenu.cpp:182
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:175
+#: src/gui/windowmenu.cpp:187
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:310 src/gui/windows/outfitwindow.cpp:76
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
 #: src/gui/windows/outfitwindow.cpp:628
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#. TRANSLATORS: bank window money label
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:91
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -5652,7 +5774,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立隊伍"
 
@@ -5883,7 +6005,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:598
+#: src/gui/windows/charselectdialog.cpp:603
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "開始"
@@ -5899,23 +6021,23 @@ msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:139
+#: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:169
+#: src/gui/windows/charselectdialog.cpp:173
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:218
+#: src/gui/windows/charselectdialog.cpp:222
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:242
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5925,27 +6047,28 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:301
+#. TRANSLATORS: error message
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:449
+#: src/gui/windows/charselectdialog.cpp:454
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:451
+#: src/gui/windows/charselectdialog.cpp:456
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:463
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:460
+#: src/gui/windows/charselectdialog.cpp:465
 msgid "Enter password:"
 msgstr ""
 
@@ -5967,7 +6090,8 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
+#. TRANSLATORS: user's pet
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6130,12 +6254,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1041
+#: src/gui/windows/inventorywindow.cpp:1043
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1045
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6366,8 +6490,9 @@ msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:125
+#. TRANSLATORS: mail view item label
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
@@ -6402,7 +6527,8 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:132
+#. TRANSLATORS: mail view attach button
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6426,6 +6552,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
@@ -6465,6 +6592,7 @@ msgstr ""
 msgid "status bar"
 msgstr ""
 
+#. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:137
 msgid "job bar"
 msgstr ""
@@ -6673,13 +6801,14 @@ msgid "Reset Windows"
 msgstr "重置視窗"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1087
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:435
-#: src/gui/windows/shopwindow.cpp:454
+#. TRANSLATORS: publish shop button
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
+#: src/gui/windows/shopwindow.cpp:465
 msgid "Publish"
 msgstr ""
 
@@ -6698,23 +6827,46 @@ msgstr ""
 msgid "Please enter new shop name"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:452
+#. TRANSLATORS: unpublish shop button
+#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
 msgid "Unpublish"
 msgstr ""
 
-#. TRANSLATORS: shop window dialog
-#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:969 src/net/ea/traderecv.cpp:163
-msgid "Request for Trade"
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:916
+msgid "error: player busy"
 msgstr ""
 
+#. TRANSLATORS: error buy/sell shop request
+#: src/gui/windows/shopwindow.cpp:958
+msgid "error: Can't sell this item"
+msgstr ""
+
+#. TRANSLATORS: error buy/sell shop request
 #: src/gui/windows/shopwindow.cpp:970
+msgid "error: Can't buy this item"
+msgstr ""
+
+#. TRANSLATORS: buy shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:990
+#, c-format
+msgid "%s wants to buy %s do you accept?"
+msgstr ""
+
+#. TRANSLATORS: sell shop request (nick, item)
+#: src/gui/windows/shopwindow.cpp:997
 #, c-format
-msgid "%s wants to %s %s do you accept?"
+msgid "%s wants to sell %s do you accept?"
+msgstr ""
+
+#. TRANSLATORS: shop window dialog
+#. TRANSLATORS: trade message
+#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1092
+#: src/gui/windows/shopwindow.cpp:1125
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6725,36 +6877,37 @@ msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:206
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:304
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:325
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:511
+#. TRANSLATORS: skill error message
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:804
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -6858,21 +7011,23 @@ msgstr ""
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
+#. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:501
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:522
+#. TRANSLATORS: party creation error
+#: src/gui/windows/socialwindow.cpp:523
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:535
+#: src/gui/windows/socialwindow.cpp:536
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:537
+#: src/gui/windows/socialwindow.cpp:538
 msgid "Choose your party's name."
 msgstr ""
 
@@ -7047,27 +7202,28 @@ msgstr "更新中..."
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/windows/updaterwindow.cpp:410
+#. TRANSLATORS: updater window checkbox
+#: src/gui/windows/updaterwindow.cpp:411
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:837
+#: src/gui/windows/updaterwindow.cpp:838
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:839
+#: src/gui/windows/updaterwindow.cpp:840
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1023
+#: src/gui/windows/updaterwindow.cpp:1024
 msgid "Completed"
 msgstr "已完成"
 
@@ -8519,284 +8675,319 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:135
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:136
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:138
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:140
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:141
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:144
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:147
+#. TRANSLATORS: error message
+#: src/net/eathena/chatrecv.cpp:152
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:327
+#: src/net/eathena/chatrecv.cpp:332
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:449
+#: src/net/eathena/chatrecv.cpp:454
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:138
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線!"
 
-#: src/net/eathena/generalhandler.cpp:211 src/net/tmwa/generalhandler.cpp:234
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
 msgid "Strength"
 msgstr "力量"
 
-#: src/net/eathena/generalhandler.cpp:213 src/net/tmwa/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
 msgid "Agility"
 msgstr "敏捷"
 
-#: src/net/eathena/generalhandler.cpp:215 src/net/tmwa/generalhandler.cpp:240
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
 msgid "Vitality"
 msgstr "體力"
 
-#: src/net/eathena/generalhandler.cpp:217 src/net/tmwa/generalhandler.cpp:243
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
 msgid "Intelligence"
 msgstr "智力"
 
-#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:246
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
 msgid "Dexterity"
 msgstr "靈巧"
 
-#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:249
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:255
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:257
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:228 src/net/tmwa/generalhandler.cpp:260
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:230 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:268
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:237
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:266
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
+#: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
+#: src/net/eathena/generalrecv.cpp:53 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
+#: src/net/eathena/generalrecv.cpp:59 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
+#: src/net/eathena/generalrecv.cpp:70 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:68
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:74
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:71
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:78
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
+#: src/net/eathena/generalrecv.cpp:82 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:77
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:86
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:80
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:90
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:83
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:86
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:98
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:89
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:92
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:106
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:95
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:110
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:99
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:102
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:119
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:105
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:108
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:131
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:115
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:136
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:118
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:140
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:121
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:144
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:124
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:127
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:152
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:130
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:156
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:133
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:160
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
+#: src/net/eathena/generalrecv.cpp:164 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:146
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:175
 msgid "Map not found"
 msgstr ""
 
@@ -8829,103 +9020,116 @@ msgstr ""
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:147
+#. TRANSLATORS: mail message notification
+#: src/net/eathena/mailrecv.cpp:148
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:225
+#. TRANSLATORS: pet hungry level
+#: src/net/eathena/petrecv.cpp:72
+#, fuzzy, c-format
+msgid "hungry level %d"
+msgstr "飢餓：%d"
+
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:229
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:233
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:242
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:241 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:282
+#: src/net/eathena/skillrecv.cpp:292
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:286
+#: src/net/eathena/skillrecv.cpp:296
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:295
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:306
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:312
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:313
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:326
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:318
+#. TRANSLATORS: skill error message
+#: src/net/eathena/skillrecv.cpp:332
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:339
+#: src/net/eathena/skillrecv.cpp:353
 msgid "Select warp target"
 msgstr ""
 
@@ -9633,7 +9837,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-msgid "Pet catched."
+msgid "Pet caught."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10178,12 +10382,12 @@ msgid "%d minutes"
 msgstr "%d 分鐘"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d second"
 msgstr "%d 秒"
 
-#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:958
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒"
author	Andrei Karas <akaras@inbox.ru>	2016-01-04 16:13:57 +0300
committer	Andrei Karas <akaras@inbox.ru>	2016-01-04 16:24:42 +0300
commit	bd36060150fc429900a9bc1c8631988fc6cd17d4 (patch)
tree	e27fe00dfff56899ca7e1411b506cce24077444c /po
parent	3256a9ef80e7431e20fe6cd349e31598ba55ee16 (diff)
download	plus-bd36060150fc429900a9bc1c8631988fc6cd17d4.tar.gz plus-bd36060150fc429900a9bc1c8631988fc6cd17d4.tar.bz2 plus-bd36060150fc429900a9bc1c8631988fc6cd17d4.tar.xz plus-bd36060150fc429900a9bc1c8631988fc6cd17d4.zip