1 files changed, 229 insertions, 229 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 688de47be..60fbe38ea 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-12-14 20:39+0300\n"
-"PO-Revision-Date: 2015-12-06 09:07+0000\n"
+"POT-Creation-Date: 2015-12-19 13:49+0300\n"
+"PO-Revision-Date: 2015-12-15 09:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:162
+#: src/actions/actions.cpp:163
 msgid "File uploaded"
 msgstr ""
 
@@ -40,15 +40,15 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:165 src/client.cpp:1499 src/client.cpp:1534
+#: src/actions/actions.cpp:166 src/client.cpp:1499 src/client.cpp:1534
 #: 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:250
-#: src/gui/widgets/tabs/setup_video.cpp:278
-#: src/gui/widgets/tabs/setup_video.cpp:396
-#: src/gui/widgets/tabs/setup_video.cpp:412
+#: 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/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:428
@@ -413,8 +413,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:2356
-#: src/gui/popups/popupmenu.cpp:2398
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2397
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -497,8 +497,8 @@ msgstr "帮助"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:843 src/client.cpp:1413 src/client.cpp:1432
 #: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:678 src/gui/popups/popupmenu.cpp:755
-#: src/gui/popups/popupmenu.cpp:996 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:677 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:995 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -728,7 +728,7 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:582 src/dirs.cpp:590
+#: src/dirs.cpp:586 src/dirs.cpp:594
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出."
@@ -744,7 +744,7 @@ msgstr ""
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误!"
 
-#: src/dirs.cpp:534 src/dirs.cpp:552
+#: src/dirs.cpp:534 src/dirs.cpp:555
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出."
@@ -762,36 +762,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:257 src/gui/windows/chatwindow.cpp:2199
+#: src/game.cpp:261 src/gui/windows/chatwindow.cpp:2198
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:264 src/gui/windowmenu.cpp:163
+#: src/game.cpp:268 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:565
+#: src/game.cpp:575
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:585
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:662
+#: src/game.cpp:672
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:665
+#: src/game.cpp:675
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1199,7 +1199,7 @@ msgstr "讯息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2683
 msgid "Revive"
 msgstr ""
 
@@ -1382,8 +1382,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2028
-#: src/gui/popups/popupmenu.cpp:2106 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2105 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1708,20 +1708,20 @@ msgstr "建立"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
-#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:642
-#: src/gui/popups/popupmenu.cpp:683 src/gui/popups/popupmenu.cpp:708
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:922
-#: src/gui/popups/popupmenu.cpp:949 src/gui/popups/popupmenu.cpp:982
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1803
-#: src/gui/popups/popupmenu.cpp:1854 src/gui/popups/popupmenu.cpp:1896
-#: src/gui/popups/popupmenu.cpp:1937 src/gui/popups/popupmenu.cpp:2007
-#: src/gui/popups/popupmenu.cpp:2085 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2188 src/gui/popups/popupmenu.cpp:2214
-#: src/gui/popups/popupmenu.cpp:2232 src/gui/popups/popupmenu.cpp:2260
-#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2741
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:390
+#: src/gui/popups/popupmenu.cpp:458 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:707
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:921
+#: src/gui/popups/popupmenu.cpp:948 src/gui/popups/popupmenu.cpp:981
+#: src/gui/popups/popupmenu.cpp:1765 src/gui/popups/popupmenu.cpp:1802
+#: src/gui/popups/popupmenu.cpp:1853 src/gui/popups/popupmenu.cpp:1895
+#: src/gui/popups/popupmenu.cpp:1936 src/gui/popups/popupmenu.cpp:2006
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2145 src/gui/popups/popupmenu.cpp:2166
+#: src/gui/popups/popupmenu.cpp:2187 src/gui/popups/popupmenu.cpp:2213
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2575 src/gui/popups/popupmenu.cpp:2740
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
@@ -1757,7 +1757,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:828
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:827
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr "交易"
@@ -1771,8 +1771,8 @@ msgstr "交易"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
-#: src/gui/popups/popupmenu.cpp:831 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:289
+#: src/gui/popups/popupmenu.cpp:830 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1780,41 +1780,41 @@ msgstr "攻击"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
-#: src/gui/popups/popupmenu.cpp:480
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:262
+#: src/gui/popups/popupmenu.cpp:479
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:835
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:834
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:863
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:528 src/gui/popups/popupmenu.cpp:862
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:535 src/gui/popups/popupmenu.cpp:869
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
-#: src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:232 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:883
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:240
+#: src/gui/popups/popupmenu.cpp:239
 msgid "Nuke"
 msgstr ""
 
@@ -1831,9 +1831,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:670
-#: src/gui/popups/popupmenu.cpp:842 src/gui/popups/popupmenu.cpp:907
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:275
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:841 src/gui/popups/popupmenu.cpp:906
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "移动"
@@ -1841,7 +1841,7 @@ msgstr "移动"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:256 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "说话"
@@ -1855,7 +1855,7 @@ msgstr "说话"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2427
 #: 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:168
@@ -1872,7 +1872,7 @@ msgstr "购买"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2439
 #: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
 #: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
@@ -1884,26 +1884,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:278 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Add comment"
 msgstr "发表评论"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:302
+#: src/gui/popups/popupmenu.cpp:301
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:308
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:312
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
@@ -1911,19 +1911,19 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:316 src/gui/popups/popupmenu.cpp:2557
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
+#: src/gui/popups/popupmenu.cpp:326 src/gui/popups/popupmenu.cpp:337
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:331
+#: src/gui/popups/popupmenu.cpp:330
 msgid "Fire"
 msgstr ""
 
@@ -1931,19 +1931,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:353
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:357
+#: src/gui/popups/popupmenu.cpp:356
 msgid "Drop loot"
 msgstr ""
 
@@ -1951,7 +1951,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:359 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1967,14 +1967,14 @@ msgstr "卸下装备"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:363 src/gui/popups/popupmenu.cpp:626
 #: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr "重命名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:368
+#: src/gui/popups/popupmenu.cpp:367
 msgid "Return to egg"
 msgstr ""
 
@@ -1982,38 +1982,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:385 src/gui/popups/popupmenu.cpp:555
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:435 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2481
-#: src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:501 src/gui/popups/popupmenu.cpp:2480
+#: src/gui/popups/popupmenu.cpp:2504
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:588 src/gui/popups/popupmenu.cpp:597
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:603 src/gui/popups/popupmenu.cpp:1762
-#: src/gui/popups/popupmenu.cpp:1840 src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:1761
+#: src/gui/popups/popupmenu.cpp:1839 src/gui/popups/popupmenu.cpp:1881
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:659
 msgid "Map Item"
 msgstr "地图项"
 
@@ -2023,22 +2023,22 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:2081
-#: src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:629 src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2114
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:666
-#: src/net/eathena/skillrecv.cpp:343
+#: src/gui/popups/popupmenu.cpp:636 src/gui/popups/popupmenu.cpp:665
+#: src/net/eathena/skillrecv.cpp:341
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:672
 msgid "Move camera"
 msgstr ""
 
@@ -2047,7 +2047,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:697 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:696 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "Outfits"
@@ -2055,69 +2055,69 @@ msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:700
+#: src/gui/popups/popupmenu.cpp:699
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:726 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:725 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:729
+#: src/gui/popups/popupmenu.cpp:728
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:760 src/gui/windows/npcdialog.cpp:120
+#: src/gui/popups/popupmenu.cpp:759 src/gui/windows/npcdialog.cpp:120
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:767
+#: src/gui/popups/popupmenu.cpp:766
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:772
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:778
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:784
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:791
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:796
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:804 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:803 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "留下"
 
@@ -2127,70 +2127,70 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:809 src/gui/popups/popupmenu.cpp:2184
-#: src/gui/popups/popupmenu.cpp:2228
+#: src/gui/popups/popupmenu.cpp:808 src/gui/popups/popupmenu.cpp:2183
+#: src/gui/popups/popupmenu.cpp:2227
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:931
+#: src/gui/popups/popupmenu.cpp:930
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:976
+#: src/gui/popups/popupmenu.cpp:975
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1005
+#: src/gui/popups/popupmenu.cpp:1004
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1060
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1061
 msgid "Name:                    "
 msgstr "名称：                   "
 
-#: src/gui/popups/popupmenu.cpp:1080
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1082
+#: src/gui/popups/popupmenu.cpp:1081
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1654
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1663
+#: src/gui/popups/popupmenu.cpp:1662
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1667
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1672
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1675
 msgid "Add to trade all"
 msgstr ""
 
@@ -2199,50 +2199,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1684 src/gui/popups/popupmenu.cpp:1836
-#: src/gui/popups/popupmenu.cpp:1877 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1683 src/gui/popups/popupmenu.cpp:1835
+#: src/gui/popups/popupmenu.cpp:1876 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/popups/popupmenu.cpp:1692
+#: src/gui/popups/popupmenu.cpp:1691
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1696
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popups/popupmenu.cpp:1701
+#: src/gui/popups/popupmenu.cpp:1700
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1705
+#: src/gui/popups/popupmenu.cpp:1704
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1714 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/popups/popupmenu.cpp:1723
+#: src/gui/popups/popupmenu.cpp:1722
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1727
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1731
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1735
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -2252,7 +2252,7 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1797 src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:2626
 #: src/gui/windows/inventorywindow.cpp:201
 #: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:334
@@ -2262,46 +2262,46 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1892
+#: src/gui/popups/popupmenu.cpp:1891
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/popups/popupmenu.cpp:1983
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1930 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:1929 src/gui/popups/popupmenu.cpp:1990
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1998
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/statuswindow.cpp:86
+#: src/gui/popups/popupmenu.cpp:2003 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2044 src/gui/popups/popupmenu.cpp:2063
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2062
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
 msgid "Move down"
 msgstr ""
 
@@ -2309,30 +2309,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2142 src/gui/popups/popupmenu.cpp:2535
+#: src/gui/popups/popupmenu.cpp:2141 src/gui/popups/popupmenu.cpp:2534
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2160
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2163
+#: src/gui/popups/popupmenu.cpp:2162
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2180
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2198
 msgid "Show window"
 msgstr ""
 
@@ -2340,7 +2340,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2250 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:358 src/gui/windows/statuswindow.cpp:66
 #: src/gui/windows/statuswindow.cpp:241 src/gui/windows/statuswindow.cpp:363
 #, c-format
@@ -2349,132 +2349,132 @@ msgstr "等级：%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2256
+#: src/gui/popups/popupmenu.cpp:2255
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2338
-#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2395
+#: src/gui/popups/popupmenu.cpp:2301 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2380 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2379 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2383
+#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2382
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2344
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2343
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2347
-#: src/gui/popups/popupmenu.cpp:2359 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2358 src/gui/popups/popupmenu.cpp:2367
+#: src/gui/popups/popupmenu.cpp:2385
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:2334 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 "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2410
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:2414
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2434 src/gui/popups/popupmenu.cpp:2458
+#: src/gui/popups/popupmenu.cpp:2433 src/gui/popups/popupmenu.cpp:2457
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2445 src/gui/popups/popupmenu.cpp:2460
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2498
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2522
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2532
+#: src/gui/popups/popupmenu.cpp:2531
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2548
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2603
+#: src/gui/popups/popupmenu.cpp:2602
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2642 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Drop all"
 msgstr "所有"
 
@@ -2482,60 +2482,60 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2651 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2650 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2697 src/gui/popups/popupmenu.cpp:2701
-#: src/gui/popups/popupmenu.cpp:2705 src/gui/popups/popupmenu.cpp:2709
-#: src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2704 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2712
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2718 src/gui/popups/popupmenu.cpp:2722
-#: src/gui/popups/popupmenu.cpp:2726 src/gui/popups/popupmenu.cpp:2730
-#: src/gui/popups/popupmenu.cpp:2734
+#: src/gui/popups/popupmenu.cpp:2717 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:2725 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2733
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2581,7 +2581,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. 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:89
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "聊天"
 
@@ -4939,8 +4939,8 @@ msgstr "主题更改"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:347
-#: src/gui/widgets/tabs/setup_video.cpp:392
-#: src/gui/widgets/tabs/setup_video.cpp:409
+#: src/gui/widgets/tabs/setup_video.cpp:394
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效."
 
@@ -5033,8 +5033,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:322
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:324
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -5066,61 +5066,61 @@ msgstr ""
 #. 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:320
-#: src/gui/widgets/tabs/setup_video.cpp:449
-#: src/gui/widgets/tabs/setup_video.cpp:462
+#: src/gui/widgets/tabs/setup_video.cpp:322
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "w"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:226
+#: src/gui/widgets/tabs/setup_video.cpp:228
 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:233
+#: src/gui/widgets/tabs/setup_video.cpp:235
 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:246
+#: src/gui/widgets/tabs/setup_video.cpp:248
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:250
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:276
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:276
+#: src/gui/widgets/tabs/setup_video.cpp:278
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:361
+#: src/gui/widgets/tabs/setup_video.cpp:363
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:365
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:                 "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:390
-#: src/gui/widgets/tabs/setup_video.cpp:407
+#: src/gui/widgets/tabs/setup_video.cpp:392
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
-#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5956,24 +5956,24 @@ msgid "Enter password:"
 msgstr "输入密码:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:671
+#: src/gui/windows/chatwindow.cpp:670
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1117
+#: src/gui/windows/chatwindow.cpp:1116
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1572
+#: src/gui/windows/chatwindow.cpp:1571
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1765 src/net/eathena/petrecv.cpp:67
+#: src/gui/windows/chatwindow.cpp:1764 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -8809,7 +8809,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:641
+#: src/net/eathena/inventoryrecv.cpp:642
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -8842,98 +8842,98 @@ msgstr "新密码太短."
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:227
+#: src/net/eathena/skillrecv.cpp:225
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:235
+#: src/net/eathena/skillrecv.cpp:233
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:243 src/net/tmwa/skillrecv.cpp:148
+#: src/net/eathena/skillrecv.cpp:241 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:247 src/net/tmwa/skillrecv.cpp:152
+#: src/net/eathena/skillrecv.cpp:245 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:156
+#: src/net/eathena/skillrecv.cpp:249 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:160
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:164
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:168
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:172
+#: src/net/eathena/skillrecv.cpp:265 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:272 src/net/tmwa/skillrecv.cpp:177
+#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:276 src/net/tmwa/skillrecv.cpp:181
+#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:185
+#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284
+#: src/net/eathena/skillrecv.cpp:282
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288
+#: src/net/eathena/skillrecv.cpp:286
 msgid "Need spirits."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:297
+#: src/net/eathena/skillrecv.cpp:295
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:302
+#: src/net/eathena/skillrecv.cpp:300
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:315
+#: src/net/eathena/skillrecv.cpp:313
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:320
+#: src/net/eathena/skillrecv.cpp:318
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:341
+#: src/net/eathena/skillrecv.cpp:339
 msgid "Select warp target"
 msgstr ""
 
@@ -8980,52 +8980,52 @@ msgid "Luck:"
 msgstr "幸运:"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillrecv.cpp:115
+#: src/net/tmwa/skillrecv.cpp:113
 msgid "Trade failed!"
 msgstr "交易失败!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillrecv.cpp:119
+#: src/net/tmwa/skillrecv.cpp:117
 msgid "Emote failed!"
 msgstr "发送表情失败!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillrecv.cpp:123
+#: src/net/tmwa/skillrecv.cpp:121
 msgid "Sit failed!"
 msgstr "原地休息失败!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillrecv.cpp:127
+#: src/net/tmwa/skillrecv.cpp:125
 msgid "Chat creating failed!"
 msgstr "聊天创建失败!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillrecv.cpp:131
+#: src/net/tmwa/skillrecv.cpp:129
 msgid "Could not join party!"
 msgstr "不能加入工会!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillrecv.cpp:135
+#: src/net/tmwa/skillrecv.cpp:133
 msgid "Cannot shout!"
 msgstr "无法呼喊!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillrecv.cpp:189
+#: src/net/tmwa/skillrecv.cpp:187
 msgid "Huh? What's that?"
 msgstr "啊？那是什么?"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillrecv.cpp:200
+#: src/net/tmwa/skillrecv.cpp:198
 msgid "Warp failed..."
 msgstr "传送失败..."
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillrecv.cpp:204
+#: src/net/tmwa/skillrecv.cpp:202
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillrecv.cpp:208
+#: src/net/tmwa/skillrecv.cpp:206
 msgid "Poison had no effect..."
 msgstr "毒药无效..."