update translations.

1 files changed, 259 insertions, 234 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8bc33625a..9ce4b18b3 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: 2014-08-17 16:40+0300\n"
+"POT-Creation-Date: 2014-08-21 22:53+0300\n"
 "PO-Revision-Date: 2014-08-17 08:42+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -27,12 +27,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:843
+#: src/actions/statusbar.cpp:217
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:853
+#: src/actions/statusbar.cpp:227
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
@@ -161,8 +161,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2585
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2597
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -189,42 +189,43 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:163
+#: src/client.cpp:921 src/gui/windowmenu.cpp:163
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:930 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:933
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:75
-#: src/gui/windows/helpwindow.cpp:52
+#: src/client.cpp:936 src/gui/windowmenu.cpp:75
+#: src/gui/windows/helpwindow.cpp:54
 msgid "Help"
 msgstr "帮助"
 
 #. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -234,8 +235,9 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/gui/popups/popupmenu.cpp:628
-#: src/gui/popups/popupmenu.cpp:867 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:940 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:78 src/gui/popups/popupmenu.cpp:634
+#: src/gui/popups/popupmenu.cpp:885 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:230 src/gui/windows/npcdialog.cpp:76
 #: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -243,32 +245,32 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1064
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1112
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1155
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1318
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1330
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -282,50 +284,83 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1385 src/client.cpp:1396 src/client.cpp:1582
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
 #: src/gui/windows/charcreatedialog.cpp:368
-#: src/gui/windows/charselectdialog.cpp:275
+#: src/gui/windows/charselectdialog.cpp:279
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
 #: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:204 src/net/ea/charserverhandler.cpp:228
+#: src/net/ea/charserverhandler.cpp:204 src/net/ea/charserverhandler.cpp:236
 msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
+#. TRANSLATORS: ok dialog button
+#. TRANSLATORS: edit dialog label
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: ok dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: ok dialog button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1460 src/client.cpp:1487 src/commands.cpp:1347
+#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:311
+#: src/gui/widgets/tabs/setup_theme.cpp:342
+#: src/gui/widgets/tabs/setup_video.cpp:247
+#: src/gui/widgets/tabs/setup_video.cpp:271
+#: src/gui/widgets/tabs/setup_video.cpp:386
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charselectdialog.cpp:245
+#: src/gui/windows/charselectdialog.cpp:281 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/editserverdialog.cpp:59
+#: src/gui/windows/editserverdialog.cpp:199
+#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/quitdialog.cpp:71
+#: src/gui/windows/registerdialog.cpp:247 src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:238 src/net/ea/gamehandler.cpp:96
+#: src/net/ea/playerhandler.cpp:278 src/net/ea/playerhandler.cpp:294
+msgid "OK"
+msgstr "确定"
+
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1474
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1476
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1499
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1501
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
@@ -535,25 +570,25 @@ msgstr ""
 msgid "File uploaded"
 msgstr ""
 
-#: src/commands.cpp:1375
+#: src/commands.cpp:1378
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1383
+#: src/commands.cpp:1386
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1391
+#: src/commands.cpp:1394
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1512 src/commands.cpp:1521
+#: src/commands.cpp:1515 src/commands.cpp:1524
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1515 src/commands.cpp:1524
+#: src/commands.cpp:1518 src/commands.cpp:1527
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -599,36 +634,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:235 src/gui/widgets/tabs/chattab.cpp:477
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:477
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:479
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:479
 #: src/gui/windowmenu.cpp:150 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:629
+#: src/game.cpp:630
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:632
+#: src/game.cpp:633
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -988,7 +1023,7 @@ msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
 msgid "(?) away"
 msgstr ""
 
@@ -998,17 +1033,17 @@ msgid "Away"
 msgstr "距离"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:443
+#: src/gamemodifiers.cpp:445
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:447
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:83
+#: src/gui/dialogsmanager.cpp:87
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1179,8 +1214,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2283
-#: src/gui/popups/popupmenu.cpp:2361 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1457,17 +1492,17 @@ msgstr "建立"
 #: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
 #: src/gui/popups/popupmenu.cpp:352 src/gui/popups/popupmenu.cpp:450
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:532
-#: src/gui/popups/popupmenu.cpp:563 src/gui/popups/popupmenu.cpp:583
-#: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:807
-#: src/gui/popups/popupmenu.cpp:834 src/gui/popups/popupmenu.cpp:888
-#: src/gui/popups/popupmenu.cpp:2025 src/gui/popups/popupmenu.cpp:2061
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2153
-#: src/gui/popups/popupmenu.cpp:2194 src/gui/popups/popupmenu.cpp:2262
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2374
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2422
-#: src/gui/popups/popupmenu.cpp:2445 src/gui/popups/popupmenu.cpp:2472
-#: src/gui/popups/popupmenu.cpp:2489 src/gui/popups/popupmenu.cpp:2760
-#: src/gui/popups/popupmenu.cpp:2886 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:563 src/gui/popups/popupmenu.cpp:588
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:814
+#: src/gui/popups/popupmenu.cpp:841 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2434
+#: src/gui/popups/popupmenu.cpp:2457 src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:2501 src/gui/popups/popupmenu.cpp:2772
+#: src/gui/popups/popupmenu.cpp:2898 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1492,7 +1527,7 @@ msgstr "重量：%s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:701
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:707
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "交易"
@@ -1507,7 +1542,7 @@ msgstr "交易"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:704 src/gui/setupactiondata.h:64
+#: src/gui/popups/popupmenu.cpp:710 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:89
 #: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:295
 msgid "Attack"
@@ -1521,28 +1556,28 @@ msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:708
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:714
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:421 src/gui/popups/popupmenu.cpp:755
+#: src/gui/popups/popupmenu.cpp:421 src/gui/popups/popupmenu.cpp:761
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:428 src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:428 src/gui/popups/popupmenu.cpp:768
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
 #: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:438
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:779
 msgid "Invite to guild"
 msgstr ""
 
@@ -1568,7 +1603,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
 #: src/gui/popups/popupmenu.cpp:405 src/gui/popups/popupmenu.cpp:556
-#: src/gui/popups/popupmenu.cpp:715 src/gui/popups/popupmenu.cpp:796
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:802
 #: src/gui/setupactiondata.h:2034 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "移动"
@@ -1588,7 +1623,7 @@ msgstr "说话"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2670
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1601,7 +1636,7 @@ msgstr "购买"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2673
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1612,7 +1647,7 @@ msgstr "出售"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:385
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2734
 msgid "Add comment"
 msgstr "发表评论"
 
@@ -1638,7 +1673,7 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2754
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1658,8 +1693,8 @@ msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:397 src/gui/popups/popupmenu.cpp:736
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:397 src/gui/popups/popupmenu.cpp:742
+#: src/gui/popups/popupmenu.cpp:2718
 msgid "Kick from party"
 msgstr "踢从党"
 
@@ -1671,8 +1706,8 @@ msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:493 src/gui/popups/popupmenu.cpp:2021
-#: src/gui/popups/popupmenu.cpp:2097 src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:493 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "加入聊天"
 
@@ -1693,8 +1728,8 @@ msgstr "重命名"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:520 src/gui/popups/popupmenu.cpp:2336
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:520 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr ""
 
@@ -1715,7 +1750,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:576 src/gui/setupactiondata.h:2042
+#: src/gui/popups/popupmenu.cpp:577 src/gui/setupactiondata.h:2042
 #: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:196
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
@@ -1723,69 +1758,69 @@ msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:579
+#: src/gui/popups/popupmenu.cpp:580
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:601 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:606 src/gui/windowmenu.cpp:126
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:604
+#: src/gui/popups/popupmenu.cpp:609
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:633 src/gui/windows/npcdialog.cpp:111
+#: src/gui/popups/popupmenu.cpp:639 src/gui/windows/npcdialog.cpp:111
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:640
+#: src/gui/popups/popupmenu.cpp:646
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:652
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:652
+#: src/gui/popups/popupmenu.cpp:658
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:658
+#: src/gui/popups/popupmenu.cpp:664
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:676
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:677 src/gui/windows/socialwindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:683 src/gui/windows/socialwindow.cpp:87
 msgid "Leave"
 msgstr "留下"
 
@@ -1795,85 +1830,85 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:688 src/gui/popups/popupmenu.cpp:2453
+#: src/gui/popups/popupmenu.cpp:2497
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:729 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:2712
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:816
+#: src/gui/popups/popupmenu.cpp:823
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:861
+#: src/gui/popups/popupmenu.cpp:868
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:876
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:882
+#: src/gui/popups/popupmenu.cpp:900
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1383
+#: src/gui/popups/popupmenu.cpp:1395
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1385
+#: src/gui/popups/popupmenu.cpp:1397
 msgid "Name:                    "
 msgstr "名称：                   "
 
-#: src/gui/popups/popupmenu.cpp:1409
+#: src/gui/popups/popupmenu.cpp:1421
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1411
+#: src/gui/popups/popupmenu.cpp:1423
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1938
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1945
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1952
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr ""
 
@@ -1882,64 +1917,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1963 src/gui/popups/popupmenu.cpp:2093
-#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/inventorywindow.cpp:226
-#: src/gui/windows/inventorywindow.cpp:736 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:721 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "存储"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1970
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "商店10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "商店的一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1992 src/gui/windows/inventorywindow.cpp:228
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:228
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "拿出10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "拿出一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2006
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -1949,9 +1984,9 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2822
 #: src/gui/windows/inventorywindow.cpp:177
-#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/skilldialog.cpp:68
+#: src/gui/windows/inventorywindow.cpp:634 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
 #: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
 #: src/resources/itemtypemapdata.h:43
@@ -1959,41 +1994,41 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2180 src/gui/popups/popupmenu.cpp:2241
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2187 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2259 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr ""
 
@@ -2001,144 +2036,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2731
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:2427
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2430
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:2450
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2458
+#: src/gui/popups/popupmenu.cpp:2470
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2531 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2543 src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2636
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2570
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2546 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2549 src/gui/popups/popupmenu.cpp:2624
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2552 src/gui/popups/popupmenu.cpp:2585
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2543 src/gui/popups/popupmenu.cpp:2576
-#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/popups/popupmenu.cpp:2588
+#: src/gui/popups/popupmenu.cpp:2600 src/gui/popups/popupmenu.cpp:2609
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2564 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/popups/popupmenu.cpp:2594 src/gui/popups/popupmenu.cpp:2603
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:2606 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2633
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2652
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2668 src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2680 src/gui/popups/popupmenu.cpp:2695
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2671 src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2698
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2738
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2787
+#: src/gui/popups/popupmenu.cpp:2799
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2796
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2825 src/gui/windows/inventorywindow.cpp:192
-#: src/gui/windows/inventorywindow.cpp:744
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/windows/inventorywindow.cpp:192
+#: src/gui/windows/inventorywindow.cpp:729
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2840
 msgid "Drop all"
 msgstr "所有"
 
@@ -2146,56 +2181,57 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2834 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:749
+#: src/gui/popups/popupmenu.cpp:2846 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:734
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:194
+#: src/gui/popups/popupmenu.cpp:2854 src/gui/windows/inventorywindow.cpp:194
 msgid "Split"
 msgstr "分离"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2860
+#: src/gui/popups/popupmenu.cpp:2872
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2865
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2868
+#: src/gui/popups/popupmenu.cpp:2880
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2871
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2874
+#. TRANSLATORS: ok dialog button
+#: src/gui/popups/popupmenu.cpp:2886 src/net/ea/playerhandler.cpp:379
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Kick"
 msgstr ""
 
@@ -3206,7 +3242,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:574 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:559 src/gui/windows/statuswindow.cpp:75
 #: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
 #, c-format
 msgid "Money: %s"
@@ -3949,7 +3985,7 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:317
+#: src/gui/widgets/tabs/setup_input.cpp:321
 #: src/gui/windows/questswindow.cpp:203
 msgid "unknown"
 msgstr ""
@@ -4459,112 +4495,112 @@ msgid "No"
 msgstr "否"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61
+#: src/gui/widgets/tabs/setup_perfomance.cpp:62
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:65
+#: src/gui/widgets/tabs/setup_perfomance.cpp:66
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:69
+#: src/gui/widgets/tabs/setup_perfomance.cpp:70
 msgid "Hw acceleration"
 msgstr "硬件加速"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:73
+#: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:78
+#: src/gui/widgets/tabs/setup_perfomance.cpp:79
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:83
+#: src/gui/widgets/tabs/setup_perfomance.cpp:84
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:87
+#: src/gui/widgets/tabs/setup_perfomance.cpp:88
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:91
+#: src/gui/widgets/tabs/setup_perfomance.cpp:92
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:96
+#: src/gui/widgets/tabs/setup_perfomance.cpp:97
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:100
+#: src/gui/widgets/tabs/setup_perfomance.cpp:101
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:105
+#: src/gui/widgets/tabs/setup_perfomance.cpp:106
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:109
+#: src/gui/widgets/tabs/setup_perfomance.cpp:110
 msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:114
+#: src/gui/widgets/tabs/setup_perfomance.cpp:115
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:119
+#: src/gui/widgets/tabs/setup_perfomance.cpp:120
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:123
+#: src/gui/widgets/tabs/setup_perfomance.cpp:124
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:128
+#: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:134
+#: src/gui/widgets/tabs/setup_perfomance.cpp:135
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+#: src/gui/widgets/tabs/setup_perfomance.cpp:139
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+#: src/gui/widgets/tabs/setup_perfomance.cpp:143
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+#: src/gui/widgets/tabs/setup_perfomance.cpp:147
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+#: src/gui/widgets/tabs/setup_perfomance.cpp:151
 msgid "Cache all sprites per map (can use additional memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:155
+#: src/gui/widgets/tabs/setup_perfomance.cpp:156
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4762,14 +4798,14 @@ msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:336
+#: src/gui/widgets/tabs/setup_theme.cpp:339
 msgid "Theme Changed"
 msgstr "主题更改"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:336
-#: src/gui/widgets/tabs/setup_video.cpp:374
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_theme.cpp:339
+#: src/gui/widgets/tabs/setup_video.cpp:382
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效."
 
@@ -4862,8 +4898,8 @@ msgstr "FPS限制:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:77
 #: src/gui/widgets/tabs/setup_video.cpp:119
-#: src/gui/widgets/tabs/setup_video.cpp:304
-#: src/gui/widgets/tabs/setup_video.cpp:432
+#: src/gui/widgets/tabs/setup_video.cpp:312
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -4895,9 +4931,9 @@ msgstr ""
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:116
 #: src/gui/widgets/tabs/setup_video.cpp:120
-#: src/gui/widgets/tabs/setup_video.cpp:302
-#: src/gui/widgets/tabs/setup_video.cpp:416
-#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:310
+#: src/gui/widgets/tabs/setup_video.cpp:432
+#: src/gui/widgets/tabs/setup_video.cpp:445
 msgid "None"
 msgstr "w"
 
@@ -4924,32 +4960,32 @@ msgid "Restart needed for changes to take effect."
 msgstr "重启生效."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:263
+#: src/gui/widgets/tabs/setup_video.cpp:267
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:265
+#: src/gui/widgets/tabs/setup_video.cpp:269
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:343
+#: src/gui/widgets/tabs/setup_video.cpp:351
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:345
+#: src/gui/widgets/tabs/setup_video.cpp:353
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:                 "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:372
-#: src/gui/widgets/tabs/setup_video.cpp:381
+#: src/gui/widgets/tabs/setup_video.cpp:380
+#: src/gui/widgets/tabs/setup_video.cpp:393
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
-#: src/gui/widgets/tabs/setup_video.cpp:375
+#: src/gui/widgets/tabs/setup_video.cpp:383
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5493,7 +5529,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charselectdialog.cpp:562
+#: src/gui/windows/charselectdialog.cpp:569
 #: src/gui/windows/socialwindow.cpp:83
 msgid "Create"
 msgstr "建立"
@@ -5663,7 +5699,7 @@ msgstr "美女"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:477
+#: src/gui/windows/charcreatedialog.cpp:480
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
@@ -5684,12 +5720,12 @@ msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:470
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:483
+#: src/gui/windows/charcreatedialog.cpp:486
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -5718,7 +5754,7 @@ msgstr "登录"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:557
+#: src/gui/windows/charselectdialog.cpp:564
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "开始"
@@ -5726,7 +5762,7 @@ msgstr "开始"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverhandler.cpp:219
+#: src/net/ea/charserverhandler.cpp:223
 msgid "Info"
 msgstr "信息"
 
@@ -5761,16 +5797,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:275
+#: src/gui/windows/charselectdialog.cpp:279
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:412
+#: src/gui/windows/charselectdialog.cpp:419
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
-#: src/gui/windows/charselectdialog.cpp:412
+#: src/gui/windows/charselectdialog.cpp:419
 msgid "Enter password:"
 msgstr "输入密码:"
 
@@ -5827,18 +5863,6 @@ msgstr "下一页>"
 msgid "Auto open this window"
 msgstr "自动打开这个窗口"
 
-#. TRANSLATORS: edit dialog label
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: ok dialog button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:49 src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:54
-#: src/gui/windows/quitdialog.cpp:71 src/gui/windows/textdialog.cpp:48
-msgid "OK"
-msgstr "确定"
-
 #. TRANSLATORS: edit server dialog name
 #: src/gui/windows/editserverdialog.cpp:48
 msgid "Edit Server"
@@ -5910,7 +5934,7 @@ msgid "Unequip"
 msgstr "卸下装备"
 
 #. TRANSLATORS: help window. button.
-#: src/gui/windows/helpwindow.cpp:55
+#: src/gui/windows/helpwindow.cpp:57
 msgid "Did you know..."
 msgstr ""
 
@@ -6562,12 +6586,12 @@ msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/socialwindow.cpp:507
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:506
+#: src/gui/windows/socialwindow.cpp:509
 msgid "Choose your party's name."
 msgstr "选择n的名称."
 
@@ -7053,11 +7077,11 @@ msgstr ""
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:219
+#: src/net/ea/charserverhandler.cpp:223
 msgid "Character deleted."
 msgstr "角色已删除."
 
-#: src/net/ea/charserverhandler.cpp:228
+#: src/net/ea/charserverhandler.cpp:236
 msgid "Failed to delete character."
 msgstr "删除角色失败."
 
@@ -7077,7 +7101,8 @@ msgstr ""
 msgid "Game"
 msgstr "游戏"
 
-#: src/net/ea/gamehandler.cpp:92
+#. TRANSLATORS: error message
+#: src/net/ea/gamehandler.cpp:94
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7278,8 +7303,8 @@ msgid "Connection to server terminated. "
 msgstr "连接到服务器终止. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:272 src/net/ea/playerhandler.cpp:284
-#: src/net/ea/playerhandler.cpp:368
+#: src/net/ea/playerhandler.cpp:272 src/net/ea/playerhandler.cpp:288
+#: src/net/ea/playerhandler.cpp:376
 msgid "Message"
 msgstr "讯息"
 
@@ -7290,7 +7315,7 @@ msgid ""
 msgstr "你已携带超过半数负重。无法回复健康（体力）."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:286
+#: src/net/ea/playerhandler.cpp:290
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""