Update translations.

1 files changed, 709 insertions, 505 deletions

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 ""