update and rebuld translations.

1 files changed, 879 insertions, 852 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index cdff92a07..1e66f203a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,13 +5,14 @@
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <colorfullife81@gmail.com>, 2011.
+#   <qiuhongwen@gmail.com>, 2012.
 # 昕 邹 <sin2624+transifex@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-10-13 15:42+0300\n"
-"PO-Revision-Date: 2012-10-11 09:50+0000\n"
+"POT-Creation-Date: 2012-10-27 00:15+0300\n"
+"PO-Revision-Date: 2012-10-26 21:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -43,114 +44,114 @@ msgstr "躲闪"
 
 #: src/being.cpp:522
 msgid "miss"
-msgstr "无法出售无法出售的物品。"
+msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:771
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:775
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:776
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:994 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:112
+#: src/client.cpp:1007 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:111
 msgid "Setup"
-msgstr "魔法攻击"
+msgstr "设置"
 
-#: src/client.cpp:1001 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1014 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:1006 src/gui/setup_video.cpp:249
+#: src/client.cpp:1019 src/gui/setup_video.cpp:248
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1024
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1097
+#: src/client.cpp:1110
 msgid "Connecting to server"
-msgstr "魔法防御"
+msgstr "正在连接服务器"
 
-#: src/client.cpp:1135
+#: src/client.cpp:1148
 msgid "Logging in"
-msgstr "尝试捡起不存在的物品。"
+msgstr "登录中"
 
-#: src/client.cpp:1169
+#: src/client.cpp:1182
 msgid "Entering game world"
-msgstr "捡起物品发生不存在的物品。"
+msgstr "进入游戏世界"
 
-#: src/client.cpp:1276
+#: src/client.cpp:1289
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
-msgstr "连接到游戏服务器"
+msgstr "正在连接游戏服务器"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1334
 msgid "Changing game servers"
-msgstr "更改游戏服务器"
+msgstr "正在更改游戏服务器"
 
-#: src/client.cpp:1364 src/client.cpp:1372 src/client.cpp:1507
-#: src/gui/changeemaildialog.cpp:160 src/gui/changepassworddialog.cpp:148
-#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:272
+#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
 #: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
-#: src/gui/unregisterdialog.cpp:138 src/net/ea/charserverhandler.cpp:168
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:168
 #: src/net/ea/charserverhandler.cpp:186
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1382
+#: src/client.cpp:1397
 msgid "Requesting registration details"
-msgstr "请求注册的详细信息"
+msgstr "正在请求详细注册信息"
 
-#: src/client.cpp:1408
+#: src/client.cpp:1423
 msgid "Password Change"
-msgstr "密码更改"
+msgstr "更改密码"
 
-#: src/client.cpp:1409
+#: src/client.cpp:1424
 msgid "Password changed successfully!"
-msgstr "更改密码成功！"
+msgstr "密码更改成功！"
 
-#: src/client.cpp:1428
+#: src/client.cpp:1443
 msgid "Email Change"
-msgstr "更改电子邮件"
+msgstr "更改电子邮箱地址"
 
-#: src/client.cpp:1429
+#: src/client.cpp:1444
 msgid "Email changed successfully!"
-msgstr "更改电子邮件成功！"
+msgstr "电子邮箱地址更改成功！"
 
-#: src/client.cpp:1449
+#: src/client.cpp:1464
 msgid "Unregister Successful"
-msgstr "注销成功"
+msgstr "取消注册成功"
 
-#: src/client.cpp:1450
+#: src/client.cpp:1465
 msgid "Farewell, come back any time..."
-msgstr "再见，随时欢迎回来... ..."
+msgstr "再见，欢迎随时回来... ..."
 
-#: src/client.cpp:1674 src/client.cpp:1685 src/client.cpp:1718
-#: src/client.cpp:1733 src/client.cpp:2162 src/client.cpp:2169
+#: src/client.cpp:1691 src/client.cpp:1702 src/client.cpp:1737
+#: src/client.cpp:1752 src/client.cpp:2184 src/client.cpp:2191
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
-msgstr "%s 不存在，并且无法创建！退出。"
+msgstr "%s 不存在，且无法创建！正在退出。"
 
-#: src/client.cpp:1873
+#: src/client.cpp:1895
 #, c-format
 msgid "Invalid update host: %s"
-msgstr "无效的更新主机: %s"
+msgstr "主机更新无效：%s"
 
-#: src/client.cpp:1912 src/client.cpp:1918
+#: src/client.cpp:1934 src/client.cpp:1940
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1939
+#: src/client.cpp:1961
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr "错误：%s 不存在并且无法创建！退出。"
+msgstr "错误：%s 不存在且无法创建！正在退出。"
 
 #: src/commandhandler.cpp:228
 msgid "Unknown command."
@@ -158,27 +159,27 @@ msgstr "未知命令。"
 
 #: src/commandhandler.cpp:348
 msgid "Cannot send empty whispers!"
-msgstr "无法发送空白密语！"
+msgstr "无法发送空白私信！"
 
 #: src/commandhandler.cpp:362
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
-msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
+msgstr "无法为 \"%s\"创建私信标签！要么已经存在，要么是你自己。"
 
 #: src/commandhandler.cpp:382
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:399 src/net/ea/gui/partytab.cpp:128
+#: src/commandhandler.cpp:399 src/net/ea/gui/partytab.cpp:124
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
 #: src/commandhandler.cpp:411
 msgid "Guild name is missing."
-msgstr "公会名称是缺少的。"
+msgstr "公会名称缺失。"
 
 #: src/commandhandler.cpp:424 src/commandhandler.cpp:540
 #: src/commandhandler.cpp:582 src/commandhandler.cpp:623
@@ -187,7 +188,7 @@ msgstr "请指定一个名称。"
 
 #: src/commandhandler.cpp:475
 msgid "Return toggles chat."
-msgstr ""
+msgstr "<回车>键促发聊天。"
 
 #: src/commandhandler.cpp:475
 msgid "Message closes chat."
@@ -195,7 +196,7 @@ msgstr "讯息关闭聊天。"
 
 #: src/commandhandler.cpp:484
 msgid "Return now toggles chat."
-msgstr "<回车>键现在切换聊天。"
+msgstr "<回车>键现在促发聊天。"
 
 #: src/commandhandler.cpp:490
 msgid "Message now closes chat."
@@ -211,7 +212,7 @@ msgstr "无视"
 
 #: src/commandhandler.cpp:529
 msgid "neutral"
-msgstr "中性"
+msgstr "中立"
 
 #: src/commandhandler.cpp:548
 #, c-format
@@ -230,15 +231,15 @@ msgstr "玩家不能为 %s"
 
 #: src/commandhandler.cpp:594
 msgid "Player wasn't ignored!"
-msgstr "是不能忽视的！"
+msgstr "玩家没有被忽视！"
 
 #: src/commandhandler.cpp:601
 msgid "Player no longer ignored!"
-msgstr "玩家不再被忽略！"
+msgstr "玩家不再被忽视！"
 
 #: src/commandhandler.cpp:603
 msgid "Player could not be unignored!"
-msgstr "玩家不能被忽略!"
+msgstr "不能取消对玩家的忽视!"
 
 #: src/commandhandler.cpp:610
 msgid "blacklisted"
@@ -254,11 +255,11 @@ msgstr "玩家已经被删除!"
 
 #: src/commandhandler.cpp:641
 msgid "Player successfully erased!"
-msgstr "玩家成功删除！"
+msgstr "玩家成功被删除！"
 
 #: src/commandhandler.cpp:643
 msgid "Player could not be erased!"
-msgstr "玩家无法删除！"
+msgstr "无法删除玩家！"
 
 #: src/commandhandler.cpp:949 src/commandhandler.cpp:995
 #, c-format
@@ -324,218 +325,218 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:255 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:446
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:259 src/gui/debugwindow.cpp:50 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:263 src/gui/debugwindow.cpp:50 src/gui/widgets/chattab.cpp:448
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:534
+#: src/game.cpp:540
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:542
+#: src/game.cpp:548
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:603
+#: src/game.cpp:609
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:604
+#: src/game.cpp:610
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/gui/beingpopup.cpp:126
+#: src/gui/beingpopup.cpp:123
 #, c-format
 msgid "Party: %s"
 msgstr "团队:%s"
 
-#: src/gui/beingpopup.cpp:140
+#: src/gui/beingpopup.cpp:137
 #, c-format
 msgid "Guild: %s"
 msgstr "工会:%s"
 
-#: src/gui/beingpopup.cpp:153
+#: src/gui/beingpopup.cpp:150
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:164
+#: src/gui/beingpopup.cpp:161
 #, c-format
 msgid "Comment: %s"
 msgstr "评论: %s"
 
-#: src/gui/botcheckerwindow.cpp:268
+#: src/gui/botcheckerwindow.cpp:270
 msgid "Bot Checker"
 msgstr "挂机检查"
 
-#: src/gui/botcheckerwindow.cpp:276 src/gui/npcdialog.cpp:83
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:83
 msgid "Reset"
 msgstr "重置"
 
-#: src/gui/botcheckerwindow.cpp:302 src/gui/setup_relations.cpp:60
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:60
 msgid "Name"
 msgstr "姓名"
 
-#: src/gui/botcheckerwindow.cpp:303 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:544
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:265
 #: src/net/tmwa/generalhandler.cpp:268
 msgid "Attack"
 msgstr "攻击"
 
-#: src/gui/botcheckerwindow.cpp:304 src/gui/popupmenu.cpp:202
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:201
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "说话"
 
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:193
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:555
-#: src/gui/popupmenu.cpp:622 src/gui/setupactiondata.h:1552
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1552
 msgid "Move"
 msgstr "移动"
 
-#: src/gui/botcheckerwindow.cpp:306
+#: src/gui/botcheckerwindow.cpp:308
 msgid "Result"
 msgstr "结果"
 
-#: src/gui/buydialog.cpp:53 src/gui/buydialog.cpp:62 src/gui/buydialog.cpp:108
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:203
-#: src/gui/popupmenu.cpp:2131
+#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:202
+#: src/gui/popupmenu.cpp:2130
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buydialog.cpp:91 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:91 src/gui/selldialog.cpp:336
+#: src/gui/buydialog.cpp:92 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:92 src/gui/selldialog.cpp:337
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
-#: src/gui/buydialog.cpp:99
+#: src/gui/buydialog.cpp:100
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:104 src/gui/itemamountwindow.cpp:209
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:94 src/gui/statuswindow.cpp:802
+#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
+#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:236 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:814
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:109 src/gui/quitdialog.cpp:51
+#: src/gui/buydialog.cpp:110 src/gui/quitdialog.cpp:51
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:97 src/gui/serverdialog.cpp:250
+#: src/gui/selldialog.cpp:98 src/gui/serverdialog.cpp:250
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buydialog.cpp:110 src/gui/selldialog.cpp:98
-#: src/gui/statuswindow.cpp:540 src/gui/statuswindow.cpp:597
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:828
+#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
+#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
+#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
 msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:48
-#: src/gui/inventorywindow.cpp:184 src/gui/setup_other.cpp:149
+#: src/gui/inventorywindow.cpp:183 src/gui/setup_other.cpp:148
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:204
-#: src/gui/popupmenu.cpp:2132 src/gui/selldialog.cpp:51
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:96
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:203
+#: src/gui/popupmenu.cpp:2131 src/gui/selldialog.cpp:51
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:55 src/gui/charcreatedialog.cpp:97
-#: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:75
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:52
+#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
 #: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:287
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:428 src/gui/popupmenu.cpp:448
-#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:485
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:655
-#: src/gui/popupmenu.cpp:1713 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1805 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1898 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2016
-#: src/gui/popupmenu.cpp:2039 src/gui/quitdialog.cpp:59
-#: src/gui/registerdialog.cpp:74 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:74 src/gui/socialwindow.cpp:1176
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:362 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:463 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1897 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:2015
+#: src/gui/popupmenu.cpp:2038 src/gui/quitdialog.cpp:61
+#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1500
+#: src/gui/setup.cpp:74 src/gui/socialwindow.cpp:1185
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:53 src/gui/updaterwindow.cpp:160
+#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changeemaildialog.cpp:51
+#: src/gui/changeemaildialog.cpp:46 src/gui/changeemaildialog.cpp:50
 msgid "Change Email Address"
 msgstr "更换Email地址"
 
-#: src/gui/changeemaildialog.cpp:57 src/gui/changepassworddialog.cpp:60
+#: src/gui/changeemaildialog.cpp:56 src/gui/changepassworddialog.cpp:59
 #, c-format
 msgid "Account: %s"
 msgstr "帐号：%s"
 
-#: src/gui/changeemaildialog.cpp:60
+#: src/gui/changeemaildialog.cpp:59
 msgid "Type new email address twice:"
 msgstr "两次新的电子邮件地址："
 
-#: src/gui/changeemaildialog.cpp:135
+#: src/gui/changeemaildialog.cpp:134
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:142
+#: src/gui/changeemaildialog.cpp:141
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:149
+#: src/gui/changeemaildialog.cpp:148
 msgid "The email address entries mismatch."
 msgstr "电子邮件地址不匹配。"
 
-#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:53
-#: src/gui/charselectdialog.cpp:146
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:52
+#: src/gui/charselectdialog.cpp:147
 msgid "Change Password"
 msgstr "更换密码"
 
-#: src/gui/changepassworddialog.cpp:63 src/gui/logindialog.cpp:146
-#: src/gui/registerdialog.cpp:83 src/gui/unregisterdialog.cpp:58
+#: src/gui/changepassworddialog.cpp:62 src/gui/logindialog.cpp:147
+#: src/gui/registerdialog.cpp:83 src/gui/unregisterdialog.cpp:57
 msgid "Password:"
 msgstr "密码："
 
-#: src/gui/changepassworddialog.cpp:65
+#: src/gui/changepassworddialog.cpp:64
 msgid "Type new password twice:"
 msgstr "输入两次新密码："
 
-#: src/gui/changepassworddialog.cpp:115
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr "先输入旧密码。"
 
-#: src/gui/changepassworddialog.cpp:121
+#: src/gui/changepassworddialog.cpp:120
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:128
+#: src/gui/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:135
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr "新的密码输入不匹配。"
 
@@ -544,7 +545,7 @@ msgid "New Character"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:74 src/gui/editserverdialog.cpp:84
-#: src/gui/logindialog.cpp:145 src/gui/registerdialog.cpp:82
+#: src/gui/logindialog.cpp:146 src/gui/registerdialog.cpp:82
 msgid "Name:"
 msgstr "姓名"
 
@@ -552,14 +553,14 @@ msgstr "姓名"
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:77 src/gui/charcreatedialog.cpp:83
 #: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:137
-#: src/gui/outfitwindow.cpp:62
+#: src/gui/outfitwindow.cpp:61
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:80 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:138 src/gui/outfitwindow.cpp:61
+#: src/gui/charcreatedialog.cpp:138 src/gui/outfitwindow.cpp:60
 msgid "<"
 msgstr "<"
 
@@ -585,8 +586,8 @@ msgstr "美女"
 
 #: src/gui/charcreatedialog.cpp:91 src/gui/registerdialog.cpp:104
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
-#: src/gui/setup_audio.cpp:127 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:98
+#: src/gui/setup_audio.cpp:128 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:211 src/gui/setup_visual.cpp:98
 msgid "Other"
 msgstr "其他"
 
@@ -595,8 +596,8 @@ msgstr "其他"
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
-#: src/gui/charcreatedialog.cpp:96 src/gui/charselectdialog.cpp:635
-#: src/gui/socialwindow.cpp:1235
+#: src/gui/charcreatedialog.cpp:96 src/gui/charselectdialog.cpp:637
+#: src/gui/socialwindow.cpp:1245
 msgid "Create"
 msgstr "建立"
 
@@ -625,133 +626,133 @@ msgstr "确认删除角色"
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色？"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Account and Character Management"
 msgstr "帐号和角色管理"
 
-#: src/gui/charselectdialog.cpp:145
+#: src/gui/charselectdialog.cpp:146
 msgid "Switch Login"
 msgstr "登录"
 
-#: src/gui/charselectdialog.cpp:169 src/gui/unregisterdialog.cpp:48
-#: src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:170 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:51
 msgid "Unregister"
 msgstr "注销"
 
-#: src/gui/charselectdialog.cpp:178
+#: src/gui/charselectdialog.cpp:179
 msgid "Change Email"
 msgstr "变更电子邮件"
 
-#: src/gui/charselectdialog.cpp:272
+#: src/gui/charselectdialog.cpp:273
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:438
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:438
 msgid "Enter password:"
 msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:566 src/gui/serverdialog.cpp:254
-#: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:249
+#: src/gui/charselectdialog.cpp:568 src/gui/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:250
 #: src/gui/shopwindow.cpp:90 src/gui/shopwindow.cpp:94
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:623
+#: src/gui/charselectdialog.cpp:625
 msgid "Choose"
 msgstr "选择"
 
-#: src/gui/charselectdialog.cpp:626
+#: src/gui/charselectdialog.cpp:628
 #, c-format
 msgid "Level %d"
 msgstr "等级 %d"
 
-#: src/gui/charselectdialog.cpp:637 src/gui/charselectdialog.cpp:638
+#: src/gui/charselectdialog.cpp:639 src/gui/charselectdialog.cpp:640
 msgid "(empty)"
 msgstr "()"
 
-#: src/gui/chatwindow.cpp:119 src/gui/inventorywindow.cpp:64
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:63
 #: src/gui/setup_visual.cpp:103
 msgid "default"
 msgstr "默认"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "黑色"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "红色"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "绿色"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "蓝色"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "金"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "黄色"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "粉红色"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "紫"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "灰色"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "棕色"
 
-#: src/gui/chatwindow.cpp:130
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "彩虹1"
 
-#: src/gui/chatwindow.cpp:131
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "彩虹2"
 
-#: src/gui/chatwindow.cpp:132
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "彩虹3"
 
-#: src/gui/chatwindow.cpp:150 src/gui/inventorywindow.cpp:84
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:83
 #: src/gui/itemamountwindow.cpp:94 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:226
+#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
-#: src/gui/setup_video.cpp:218 src/gui/textcommandeditor.cpp:99
+#: src/gui/setup_video.cpp:216 src/gui/textcommandeditor.cpp:99
 #: src/gui/textcommandeditor.cpp:139 src/gui/textcommandeditor.cpp:159
-#: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
+#: src/gui/widgets/extendednamesmodel.cpp:46 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "？？？"
 
-#: src/gui/chatwindow.cpp:159 src/gui/setupactiondata.h:1557
+#: src/gui/chatwindow.cpp:158 src/gui/setupactiondata.h:1557
 #: src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:677
+#: src/gui/chatwindow.cpp:676
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1093
+#: src/gui/chatwindow.cpp:1092
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -764,14 +765,14 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072 src/gui/popupmenu.cpp:2081
-#: src/gui/popupmenu.cpp:2100
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2080
+#: src/gui/popupmenu.cpp:2099
 msgid "Ignore"
 msgstr "忽略"
 
 #: src/gui/debugwindow.cpp:67 src/gui/minimap.cpp:48 src/gui/minimap.cpp:101
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "地图"
 
@@ -783,50 +784,50 @@ msgstr ""
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:219
+#: src/gui/debugwindow.cpp:248
 msgid "Music:"
 msgstr "音乐："
 
-#: src/gui/debugwindow.cpp:140 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:140 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:250
 msgid "Map:"
 msgstr "地图："
 
-#: src/gui/debugwindow.cpp:141 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:248
+#: src/gui/debugwindow.cpp:141 src/gui/debugwindow.cpp:221
+#: src/gui/debugwindow.cpp:249
 msgid "Minimap:"
 msgstr "小地图："
 
-#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:216
-#: src/gui/debugwindow.cpp:245
+#: src/gui/debugwindow.cpp:143 src/gui/debugwindow.cpp:217
+#: src/gui/debugwindow.cpp:246
 msgid "Cursor:"
 msgstr "光标："
 
-#: src/gui/debugwindow.cpp:143 src/gui/debugwindow.cpp:199
-#: src/gui/debugwindow.cpp:204
+#: src/gui/debugwindow.cpp:145
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:234
+#: src/gui/debugwindow.cpp:253
+msgid "Map actors count:"
+msgstr "地图演员数："
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:200
+#: src/gui/debugwindow.cpp:205
 msgid "Player Position:"
 msgstr "的位置："
 
-#: src/gui/debugwindow.cpp:146
+#: src/gui/debugwindow.cpp:151
 #, c-format
 msgid "%d FPS"
 msgstr "%d的FPS"
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:259
+#: src/gui/debugwindow.cpp:152 src/gui/debugwindow.cpp:260
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:153
-msgid "Particle count:"
-msgstr ""
-
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:233
-#: src/gui/debugwindow.cpp:252
-msgid "Map actors count:"
-msgstr "地图演员数："
-
 #: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:172
 #, c-format
 msgid "%d FPS (Software)"
@@ -842,115 +843,115 @@ msgstr "%d的FPS (快速 OpenGL)"
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (旧的OpenGL)"
 
-#: src/gui/debugwindow.cpp:186 src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:187 src/gui/debugwindow.cpp:239
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:230
 #, c-format
 msgid "Particle count: %d"
 msgstr "粒子数：%d个"
 
-#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:265 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:348
 msgid "Target:"
 msgstr "目标："
 
-#: src/gui/debugwindow.cpp:265 src/gui/debugwindow.cpp:305
-#: src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:266 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:349
 msgid "Target Id:"
 msgstr "目标ID："
 
-#: src/gui/debugwindow.cpp:266
+#: src/gui/debugwindow.cpp:267
 msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:267 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:319
 msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:269
 msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269
+#: src/gui/debugwindow.cpp:270
 msgid "Target guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:337
-#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:343 src/gui/debugwindow.cpp:353
 msgid "Attack delay:"
 msgstr "攻击延迟："
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:328
+#: src/gui/debugwindow.cpp:354
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:354
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:355
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:331
-#: src/gui/debugwindow.cpp:355
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:356
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:309 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:310 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:350
 msgid "Target Level:"
 msgstr "目标水平："
 
-#: src/gui/debugwindow.cpp:320 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:321 src/gui/debugwindow.cpp:351
 msgid "Target Party:"
 msgstr "目标："
 
-#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:324 src/gui/debugwindow.cpp:352
 msgid "Target Guild:"
 msgstr "目标公会："
 
-#: src/gui/debugwindow.cpp:388 src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:389 src/gui/debugwindow.cpp:394
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:396
+#: src/gui/debugwindow.cpp:397
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "输入:%d 字节/"
 
-#: src/gui/debugwindow.cpp:398
+#: src/gui/debugwindow.cpp:399
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:51
+#: src/gui/didyouknowwindow.cpp:50
 msgid "Did You Know?"
 msgstr "你知道吗？"
 
-#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
-#: src/gui/inventorywindow.cpp:209 src/gui/npcdialog.cpp:58
-#: src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:100 src/gui/shopwindow.cpp:78
-msgid "Close"
-msgstr "关闭"
-
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:55
 msgid "< Previous"
 msgstr "<上一页"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:56
 msgid "Next >"
 msgstr "下一页>"
 
-#: src/gui/didyouknowwindow.cpp:72
+#: src/gui/didyouknowwindow.cpp:57
 msgid "Auto open this window"
 msgstr "自动打开这个窗口"
 
+#: src/gui/didyouknowwindow.cpp:71 src/gui/helpwindow.cpp:64
+#: src/gui/inventorywindow.cpp:208 src/gui/npcdialog.cpp:58
+#: src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:501
+#: src/gui/questswindow.cpp:98 src/gui/shopwindow.cpp:78
+msgid "Close"
+msgstr "关闭"
+
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:74
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:49
-#: src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:45
+#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:50
+#: src/gui/quitdialog.cpp:60 src/gui/textdialog.cpp:45
 msgid "OK"
 msgstr "确定"
 
@@ -982,88 +983,88 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:55 src/gui/inventorywindow.cpp:185
-#: src/gui/windowmenu.cpp:86
+#: src/gui/equipmentwindow.cpp:54 src/gui/inventorywindow.cpp:184
+#: src/gui/windowmenu.cpp:85
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:169
-#: src/gui/inventorywindow.cpp:596 src/gui/popupmenu.cpp:1668
-#: src/gui/popupmenu.cpp:1770 src/gui/popupmenu.cpp:1826
+#: src/gui/equipmentwindow.cpp:59 src/gui/inventorywindow.cpp:168
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1825
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/helpwindow.cpp:48
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "帮助"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:64
 msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:65
 msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:67
+#: src/gui/inventorywindow.cpp:66
 msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:68
+#: src/gui/inventorywindow.cpp:67
 msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:69
+#: src/gui/inventorywindow.cpp:68
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/windowmenu.cpp:88
+#: src/gui/inventorywindow.cpp:127 src/gui/windowmenu.cpp:87
 #: src/inventory.cpp:255
 msgid "Inventory"
 msgstr "物品栏"
 
-#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:598
-#: src/gui/outfitwindow.cpp:63 src/gui/popupmenu.cpp:1670
-#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1828
+#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1771 src/gui/popupmenu.cpp:1827
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:168 src/gui/inventorywindow.cpp:602
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1739
-#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1832
-#: src/gui/skilldialog.cpp:231
+#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
+#: src/gui/skilldialog.cpp:236
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:181 src/gui/inventorywindow.cpp:698
-#: src/gui/popupmenu.cpp:1679 src/gui/popupmenu.cpp:1781
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
+#: src/gui/popupmenu.cpp:1678 src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1836
 msgid "Drop..."
 msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:182 src/gui/popupmenu.cpp:1688
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1846
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1687
+#: src/gui/popupmenu.cpp:1789 src/gui/popupmenu.cpp:1845
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:183 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1556
+#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
+#: src/gui/popupmenu.cpp:459 src/gui/setupactiondata.h:1556
 msgid "Outfits"
 msgstr "套装"
 
-#: src/gui/inventorywindow.cpp:207 src/gui/inventorywindow.cpp:689
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1793
-#: src/gui/popupmenu.cpp:1849 src/gui/setup.cpp:75
+#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1848 src/gui/setup.cpp:75
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:208 src/gui/popupmenu.cpp:1695
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1694
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:700 src/gui/popupmenu.cpp:1684
-#: src/gui/popupmenu.cpp:1786 src/gui/popupmenu.cpp:1842
-#: src/gui/windowmenu.cpp:109
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1785 src/gui/popupmenu.cpp:1841
+#: src/gui/windowmenu.cpp:108
 msgid "Drop"
 msgstr "丢弃"
 
@@ -1071,138 +1072,138 @@ msgstr "丢弃"
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamountwindow.cpp:263
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量。"
 
-#: src/gui/itemamountwindow.cpp:266
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量。"
 
-#: src/gui/itemamountwindow.cpp:269
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量。"
 
-#: src/gui/itemamountwindow.cpp:272
+#: src/gui/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量。"
 
-#: src/gui/itemamountwindow.cpp:275
+#: src/gui/itemamountwindow.cpp:277
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量"
 
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:280
 msgid "Add to buy shop."
 msgstr "添加到购买商店。"
 
-#: src/gui/itemamountwindow.cpp:281
+#: src/gui/itemamountwindow.cpp:283
 msgid "Add to sell shop."
 msgstr "添加到出售商店。"
 
-#: src/gui/itemamountwindow.cpp:284
+#: src/gui/itemamountwindow.cpp:286
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/gui/itempopup.cpp:170 src/gui/itempopup.cpp:176
+#: src/gui/itempopup.cpp:165 src/gui/itempopup.cpp:171
 msgid ", "
 msgstr ","
 
-#: src/gui/itempopup.cpp:186
+#: src/gui/itempopup.cpp:181
 #, c-format
 msgid "Weight: %s"
 msgstr "重量：%s"
 
-#: src/gui/killstats.cpp:43 src/gui/windowmenu.cpp:81
+#: src/gui/killstats.cpp:42 src/gui/windowmenu.cpp:80
 msgid "Kill stats"
 msgstr "杀敌统计"
 
-#: src/gui/killstats.cpp:50
+#: src/gui/killstats.cpp:49
 msgid "Reset stats"
 msgstr "复位统计"
 
-#: src/gui/killstats.cpp:51
+#: src/gui/killstats.cpp:50
 msgid "Reset timer"
 msgstr "复位定时器"
 
-#: src/gui/killstats.cpp:52 src/gui/killstats.cpp:150
-#: src/gui/killstats.cpp:244 src/gui/killstats.cpp:466
+#: src/gui/killstats.cpp:51 src/gui/killstats.cpp:153
+#: src/gui/killstats.cpp:247 src/gui/killstats.cpp:469
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:53 src/gui/killstats.cpp:151
-#: src/gui/killstats.cpp:225 src/gui/killstats.cpp:237
-#: src/gui/killstats.cpp:467
+#: src/gui/killstats.cpp:53 src/gui/killstats.cpp:154
+#: src/gui/killstats.cpp:228 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:470
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:54 src/gui/killstats.cpp:153
-#: src/gui/killstats.cpp:229 src/gui/killstats.cpp:240
-#: src/gui/killstats.cpp:469
+#: src/gui/killstats.cpp:54 src/gui/killstats.cpp:156
+#: src/gui/killstats.cpp:232 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:472
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:55 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:247 src/gui/killstats.cpp:471
+#: src/gui/killstats.cpp:56 src/gui/killstats.cpp:166
+#: src/gui/killstats.cpp:250 src/gui/killstats.cpp:474
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:56 src/gui/killstats.cpp:61 src/gui/killstats.cpp:66
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:316
-#: src/gui/killstats.cpp:335
+#: src/gui/killstats.cpp:59 src/gui/killstats.cpp:64 src/gui/killstats.cpp:69
+#: src/gui/killstats.cpp:302 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:338
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:59 src/gui/killstats.cpp:64 src/gui/killstats.cpp:69
+#: src/gui/killstats.cpp:61 src/gui/killstats.cpp:66 src/gui/killstats.cpp:72
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:251
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:254
 msgid "Last kill exp:"
 msgstr "最后EXP："
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:374 src/gui/killstats.cpp:380
-#: src/gui/killstats.cpp:385
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:377 src/gui/killstats.cpp:383
+#: src/gui/killstats.cpp:388
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:107 src/gui/killstats.cpp:214
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "等级:%d 在 %f%%"
 
-#: src/gui/killstats.cpp:108 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:111 src/gui/killstats.cpp:219
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:111 src/gui/killstats.cpp:222
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:114 src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:304 src/gui/killstats.cpp:312
-#: src/gui/killstats.cpp:322 src/gui/killstats.cpp:330
-#: src/gui/killstats.cpp:342 src/gui/killstats.cpp:350
+#: src/gui/killstats.cpp:307 src/gui/killstats.cpp:315
+#: src/gui/killstats.cpp:325 src/gui/killstats.cpp:333
+#: src/gui/killstats.cpp:345 src/gui/killstats.cpp:353
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:377
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:380
+#: src/gui/killstats.cpp:383
 msgid "jacko spawning"
 msgstr ""
 
@@ -1222,7 +1223,7 @@ msgstr "自动关闭"
 msgid "Skip"
 msgstr "跳过"
 
-#: src/gui/logindialog.cpp:119 src/gui/logindialog.cpp:131
+#: src/gui/logindialog.cpp:119 src/gui/logindialog.cpp:132
 msgid "Login"
 msgstr "登录"
 
@@ -1230,80 +1231,80 @@ msgstr "登录"
 msgid "Remember username"
 msgstr "记住用户名"
 
-#: src/gui/logindialog.cpp:126
+#: src/gui/logindialog.cpp:127
 msgid "Update:"
 msgstr "更新日期："
 
-#: src/gui/logindialog.cpp:130
+#: src/gui/logindialog.cpp:131
 msgid "Change Server"
 msgstr "更改服务器"
 
-#: src/gui/logindialog.cpp:132 src/gui/registerdialog.cpp:65
-#: src/gui/registerdialog.cpp:73
+#: src/gui/logindialog.cpp:133 src/gui/registerdialog.cpp:64
+#: src/gui/registerdialog.cpp:72
 msgid "Register"
 msgstr "注册"
 
-#: src/gui/logindialog.cpp:133
+#: src/gui/logindialog.cpp:134
 msgid "Custom update host"
 msgstr "自定义更新主机"
 
-#: src/gui/logindialog.cpp:142 src/gui/widgets/chattab.cpp:171
+#: src/gui/logindialog.cpp:143 src/gui/widgets/chattab.cpp:170
 msgid "Server:"
 msgstr "服务器："
 
-#: src/gui/logindialog.cpp:149
+#: src/gui/logindialog.cpp:150
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/ministatuswindow.cpp:56
+#: src/gui/ministatuswindow.cpp:54
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatuswindow.cpp:59
+#: src/gui/ministatuswindow.cpp:57
 msgid "mana bar"
 msgstr "法力栏"
 
-#: src/gui/ministatuswindow.cpp:62
+#: src/gui/ministatuswindow.cpp:60
 msgid "experience bar"
 msgstr "经验条"
 
-#: src/gui/ministatuswindow.cpp:64
+#: src/gui/ministatuswindow.cpp:62
 msgid "weight bar"
 msgstr "重量栏"
 
-#: src/gui/ministatuswindow.cpp:66
+#: src/gui/ministatuswindow.cpp:64
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatuswindow.cpp:68
+#: src/gui/ministatuswindow.cpp:66
 msgid "money bar"
 msgstr "钱栏"
 
-#: src/gui/ministatuswindow.cpp:70
+#: src/gui/ministatuswindow.cpp:68
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatuswindow.cpp:72
+#: src/gui/ministatuswindow.cpp:70
 msgid "status bar"
 msgstr "状态栏"
 
-#: src/gui/ministatuswindow.cpp:91
+#: src/gui/ministatuswindow.cpp:89
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatuswindow.cpp:289 src/gui/statuswindow.cpp:279
+#: src/gui/ministatuswindow.cpp:288 src/gui/statuswindow.cpp:281
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
 
-#: src/gui/ministatuswindow.cpp:295 src/gui/statuswindow.cpp:131
-#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:351
+#: src/gui/ministatuswindow.cpp:294 src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/ministatuswindow.cpp:311 src/gui/ministatuswindow.cpp:347
+#: src/gui/ministatuswindow.cpp:310 src/gui/ministatuswindow.cpp:346
 msgid "Need"
 msgstr "需要"
 
@@ -1320,11 +1321,11 @@ msgid "Submit"
 msgstr "提交"
 
 #: src/gui/npcdialog.cpp:64 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:157
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "清除"
 
@@ -1340,373 +1341,373 @@ msgstr "发送"
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
-#: src/gui/outfitwindow.cpp:64 src/gui/outfitwindow.cpp:544
+#: src/gui/outfitwindow.cpp:63 src/gui/outfitwindow.cpp:543
 #, c-format
 msgid "Outfit: %d"
 msgstr "套装： %d"
 
-#: src/gui/outfitwindow.cpp:65
+#: src/gui/outfitwindow.cpp:64
 msgid "Unequip first"
-msgstr ""
+msgstr "先卸掉装备"
 
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/outfitwindow.cpp:66
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:69 src/gui/outfitwindow.cpp:546
-#: src/gui/windowmenu.cpp:301
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:545
+#: src/gui/windowmenu.cpp:296
 #, c-format
 msgid "Key: %s"
 msgstr "按键：%s"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:543
-#: src/gui/widgets/tradetab.cpp:42
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:542
+#: src/gui/widgets/tradetab.cpp:40
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:307
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:306
 msgid "Whisper"
 msgstr "密语"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "愈合"
 
-#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:342 src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "踢从公会"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:189
 msgid "Kick player"
 msgstr "踢球员"
 
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:191
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:314
-#: src/gui/popupmenu.cpp:2172
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:2171
 msgid "Add comment"
 msgstr "发表评论"
 
-#: src/gui/popupmenu.cpp:218
+#: src/gui/popupmenu.cpp:217
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:228
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:234
+#: src/gui/popupmenu.cpp:233
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:235
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
-#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:2187
+#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:2186
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:360
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:264 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/popupmenu.cpp:324 src/gui/popupmenu.cpp:571
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:323 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2161
 msgid "Kick from party"
 msgstr "踢从党"
 
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
 msgid "Pick up"
 msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1849
 msgid "Add to chat"
 msgstr "加入聊天"
 
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:440
 msgid "Map Item"
 msgstr "地图项"
 
-#: src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:418
 msgid "Rename"
 msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:1990
-#: src/gui/popupmenu.cpp:2014
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:1989
+#: src/gui/popupmenu.cpp:2013
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:443
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:445
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:460
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481 src/gui/windowmenu.cpp:108
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:107
 msgid "Spells"
 msgstr "法术"
 
-#: src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "禁用"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "启用突出"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "移除姓名"
 
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "启用远"
 
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1237
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1247
 msgid "Leave"
 msgstr "留下"
 
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:2160
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2159
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:637
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1153
 msgid "Rename map sign          "
 msgstr "重命名的地图标志"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1155
 msgid "Name:                    "
 msgstr "名称："
 
-#: src/gui/popupmenu.cpp:1179
+#: src/gui/popupmenu.cpp:1178
 msgid "Player comment            "
 msgstr "玩家评论"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1181
+#: src/gui/popupmenu.cpp:1180
 msgid "Comment:                      "
 msgstr "评论："
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1639
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1644
+#: src/gui/popupmenu.cpp:1643
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1644
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1645
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1647
+#: src/gui/popupmenu.cpp:1646
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1656
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1657
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1658
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1659
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/popupmenu.cpp:1679 src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1837
 msgid "Drop all"
 msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1699
+#: src/gui/popupmenu.cpp:1698
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1699
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1700
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1701
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1858
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1924
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1923
 msgid "Hide"
 msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1930
+#: src/gui/popupmenu.cpp:1892 src/gui/popupmenu.cpp:1929
 msgid "Show"
 msgstr "显示"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1935
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:148
+#: src/gui/popupmenu.cpp:1937 src/gui/statuswindow.cpp:150
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1958 src/gui/popupmenu.cpp:2010
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:2009
 #: src/gui/setup_theme.cpp:61 src/gui/setup_theme.cpp:125
-#: src/gui/socialwindow.cpp:913
+#: src/gui/socialwindow.cpp:919
 msgid "(default)"
 msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1978
 msgid "Move up"
 msgstr "x"
 
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:1969 src/gui/popupmenu.cpp:1980
 msgid "Move down"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2036 src/gui/popupmenu.cpp:2171
+#: src/gui/popupmenu.cpp:2035 src/gui/popupmenu.cpp:2170
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2061
 msgid "Be friend"
 msgstr "是朋友"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2071
-#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2099
-#: src/gui/popupmenu.cpp:2107
+#: src/gui/popupmenu.cpp:2062 src/gui/popupmenu.cpp:2070
+#: src/gui/popupmenu.cpp:2079 src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2106
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2073
-#: src/gui/popupmenu.cpp:2101
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2100
 msgid "Black list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
-#: src/gui/popupmenu.cpp:2082
+#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2081
 msgid "Set as enemy"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2075
-#: src/gui/popupmenu.cpp:2083 src/gui/popupmenu.cpp:2089
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2102
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2088
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2101
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2079 src/gui/popupmenu.cpp:2087
-#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2098
-#: src/gui/popupmenu.cpp:2106
+#: src/gui/popupmenu.cpp:2078 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2105
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2088 src/gui/popupmenu.cpp:2108
-#: src/playerrelations.cpp:472
+#: src/gui/popupmenu.cpp:2087 src/gui/popupmenu.cpp:2107
+#: src/playerrelations.cpp:473
 msgid "Completely ignore"
 msgstr "完全忽略"
 
-#: src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2117
 msgid "Follow"
 msgstr "按照"
 
-#: src/gui/popupmenu.cpp:2119
+#: src/gui/popupmenu.cpp:2118
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2147
 msgid "Buy (?)"
 msgstr "购买(?)"
 
-#: src/gui/popupmenu.cpp:2138 src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2148
 msgid "Sell (?)"
 msgstr "出售(?)"
 
-#: src/gui/popupmenu.cpp:2170
+#: src/gui/popupmenu.cpp:2169
 msgid "Show Items"
 msgstr "显示项目"
 
-#: src/gui/popupmenu.cpp:2181
+#: src/gui/popupmenu.cpp:2180
 msgid "Remove from pickup list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2185
+#: src/gui/popupmenu.cpp:2184
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:90 src/gui/windowmenu.cpp:77
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:76
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:199 src/gui/setup_input.cpp:353
+#: src/gui/questswindow.cpp:197 src/gui/setup_input.cpp:352
 msgid "unknown"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "交换服务器"
 
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:59
 msgid "Switch character"
 msgstr "交换角色"
 
@@ -1728,12 +1729,12 @@ msgstr ""
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
-#: src/gui/registerdialog.cpp:208 src/gui/unregisterdialog.cpp:122
+#: src/gui/registerdialog.cpp:208 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
-#: src/gui/registerdialog.cpp:216 src/gui/unregisterdialog.cpp:129
+#: src/gui/registerdialog.cpp:216 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
@@ -1747,12 +1748,12 @@ msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
 #: src/gui/serverdialog.cpp:252 src/gui/shopwindow.cpp:89
-#: src/gui/shopwindow.cpp:93 src/gui/tradewindow.cpp:71
+#: src/gui/shopwindow.cpp:93 src/gui/tradewindow.cpp:70
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/serverdialog.cpp:253 src/gui/widgets/setupitem.cpp:288
-#: src/gui/widgets/setupitem.cpp:412
+#: src/gui/serverdialog.cpp:253 src/gui/widgets/setupitem.cpp:289
+#: src/gui/widgets/setupitem.cpp:414
 msgid "Edit"
 msgstr "编辑"
 
@@ -1764,32 +1765,32 @@ msgstr "负载"
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "选择你的服务器***安全模式***"
 
-#: src/gui/serverdialog.cpp:271
+#: src/gui/serverdialog.cpp:272
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
-#: src/gui/serverdialog.cpp:504
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:509
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
-#: src/gui/serverdialog.cpp:513
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "准备下载"
 
-#: src/gui/serverdialog.cpp:517
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误！"
 
-#: src/gui/serverdialog.cpp:605
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
-#: src/gui/serverdialog.cpp:607
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -2328,11 +2329,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1553 src/gui/windowmenu.cpp:106
+#: src/gui/setupactiondata.h:1553 src/gui/windowmenu.cpp:105
 msgid "Shortcuts"
-msgstr ""
+msgstr "快捷键"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:186
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:185
 msgid "Windows"
 msgstr ""
 
@@ -2344,115 +2345,115 @@ msgstr ""
 msgid "Gui"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:46
 msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:58
+#: src/gui/setup_audio.cpp:59
 msgid "Audio"
 msgstr "音频"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:66
 msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:67
+#: src/gui/setup_audio.cpp:68
 msgid "Enable Audio"
 msgstr "启用音频"
 
-#: src/gui/setup_audio.cpp:69
+#: src/gui/setup_audio.cpp:70
 msgid "Enable music"
 msgstr "启用音乐"
 
-#: src/gui/setup_audio.cpp:72
+#: src/gui/setup_audio.cpp:73
 msgid "Enable game sfx"
 msgstr "启用游戏SFX"
 
-#: src/gui/setup_audio.cpp:75
+#: src/gui/setup_audio.cpp:76
 msgid "Enable gui sfx"
 msgstr "启用GUI SFX"
 
-#: src/gui/setup_audio.cpp:78
+#: src/gui/setup_audio.cpp:79
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: src/gui/setup_audio.cpp:81
+#: src/gui/setup_audio.cpp:82
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: src/gui/setup_audio.cpp:84
+#: src/gui/setup_audio.cpp:85
 msgid "Audio frequency"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:87
+#: src/gui/setup_audio.cpp:88
 msgid "mono"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:88
+#: src/gui/setup_audio.cpp:89
 msgid "stereo"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:89
+#: src/gui/setup_audio.cpp:90
 msgid "surround"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:90
+#: src/gui/setup_audio.cpp:91
 msgid "surround+center+lfe"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:91
+#: src/gui/setup_audio.cpp:92
 msgid "Audio channels"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:95
+#: src/gui/setup_audio.cpp:96
 msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:97
+#: src/gui/setup_audio.cpp:98
 msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:100
+#: src/gui/setup_audio.cpp:101
 msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:103
+#: src/gui/setup_audio.cpp:104
 msgid "Whisper message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:107
 msgid "Guild / Party message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:109
+#: src/gui/setup_audio.cpp:110
 msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:112
+#: src/gui/setup_audio.cpp:113
 msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:115
+#: src/gui/setup_audio.cpp:116
 msgid "Error message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:118
+#: src/gui/setup_audio.cpp:119
 msgid "Trade request sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:121
+#: src/gui/setup_audio.cpp:122
 msgid "Show window sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:124
+#: src/gui/setup_audio.cpp:125
 msgid "Hide window sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:129
+#: src/gui/setup_audio.cpp:131
 msgid "Enable mumble voice chat"
 msgstr "启用语音聊天"
 
-#: src/gui/setup_audio.cpp:132
+#: src/gui/setup_audio.cpp:135
 msgid "Download music"
 msgstr "下载音乐"
 
@@ -2464,7 +2465,7 @@ msgstr ""
 msgid "Auto hide chat window."
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:80
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:79
 msgid "Colors"
 msgstr "颜色"
 
@@ -2526,7 +2527,7 @@ msgstr "将所有密语放于标签夜"
 
 #: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
-msgstr ""
+msgstr "在调试页记录魔法信息"
 
 #: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
@@ -2564,50 +2565,50 @@ msgstr ""
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:48
 msgid "This is what the color looks like"
 msgstr "这就是该色彩看起来的样子"
 
-#: src/gui/setup_colors.cpp:61
+#: src/gui/setup_colors.cpp:60
 msgid "Type:"
 msgstr "类型:"
 
-#: src/gui/setup_colors.cpp:64 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:63 src/gui/setup_colors.cpp:317
 msgid "Delay:"
 msgstr "延迟："
 
-#: src/gui/setup_colors.cpp:67
+#: src/gui/setup_colors.cpp:66
 msgid "Red:"
 msgstr "红色："
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:70
 msgid "Green:"
 msgstr "绿色："
 
-#: src/gui/setup_colors.cpp:75
+#: src/gui/setup_colors.cpp:74
 msgid "Blue:"
 msgstr "蓝色："
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:406
 msgid "Static"
 msgstr "静止的"
 
-#: src/gui/setup_colors.cpp:100 src/gui/setup_colors.cpp:101
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:100
+#: src/gui/setup_colors.cpp:407
 msgid "Pulse"
 msgstr "脉冲"
 
-#: src/gui/setup_colors.cpp:102 src/gui/setup_colors.cpp:103
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:101 src/gui/setup_colors.cpp:102
+#: src/gui/setup_colors.cpp:408
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:104 src/gui/setup_colors.cpp:105
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:103 src/gui/setup_colors.cpp:104
+#: src/gui/setup_colors.cpp:408
 msgid "Spectrum"
 msgstr "色谱"
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:312
 msgid "Alpha:"
 msgstr "阿尔法："
 
@@ -2619,31 +2620,31 @@ msgstr "应用"
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setup_input.cpp:97
+#: src/gui/setup_input.cpp:96
 msgid "Assign"
 msgstr "分配"
 
-#: src/gui/setup_input.cpp:98
+#: src/gui/setup_input.cpp:97
 msgid "Unassign"
 msgstr "取消分配"
 
-#: src/gui/setup_input.cpp:99
+#: src/gui/setup_input.cpp:98
 msgid "Default"
 msgstr "预设"
 
-#: src/gui/setup_input.cpp:100
+#: src/gui/setup_input.cpp:99
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:106
+#: src/gui/setup_input.cpp:105
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:193
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突。"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:194
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2678,255 +2679,259 @@ msgstr "停止"
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "杂项"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:124
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:124
 msgid "Monsters"
 msgstr "怪物"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "显示损坏造成的，以怪物"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "自动目标只有到达怪物"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "突出显示怪物的攻击范围"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "显示怪物HP栏"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "突出显示的地图门户网站"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "突出地板项目"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "突出显示球员的攻击范围"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "绘制路径"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
 msgid "Enable lazy scrolling"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_other.cpp:98
+#: src/gui/setup_other.cpp:97
 msgid "Moving"
 msgstr "移动"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Auto fix position"
 msgstr "自动修复的位置"
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:102
 msgid "Attack while moving"
 msgstr "攻击的同时移动"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Attack next target"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Sync player move"
 msgstr "同步播放移动"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Crazy move A program"
 msgstr "疯狂的举动的程序"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:115
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show own hp bar"
 msgstr "显示自己的HP栏"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Enable quick stats"
 msgstr "启用快速统计"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Show job exp messages"
 msgstr "显示工作EXP消息"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Show players popups"
 msgstr "显示球员弹出窗口"
 
-#: src/gui/setup_other.cpp:133
+#: src/gui/setup_other.cpp:132
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Show job"
 msgstr "显示工作"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable attack filter"
 msgstr "启用攻击过滤器"
 
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:141
 msgid "Enable pickup filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Accept sell/buy requests"
 msgstr "接受出售/购买请求"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable shop mode"
 msgstr "启用商店模式"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Cycle npc targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:166
 msgid "Bots support"
 msgstr "挂机支持"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Enable auction bot support"
 msgstr "启用拍卖挂机支持"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:171
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:176
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:178
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:181
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:190
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:197
+#: src/gui/setup_other.cpp:196
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:198
+#: src/gui/setup_other.cpp:197
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:204
+#: src/gui/setup_other.cpp:203
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:204
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:207
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:213
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:216
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
-#: src/gui/setup_other.cpp:220
+#: src/gui/setup_other.cpp:219
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:223
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:226
+msgid "Enable OpenGL log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:229
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
-#: src/gui/setup_other.cpp:230
+#: src/gui/setup_other.cpp:232
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:233
+#: src/gui/setup_other.cpp:235
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:236
+#: src/gui/setup_other.cpp:238
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:239
+#: src/gui/setup_other.cpp:241
 msgid "Show background"
 msgstr "显示背景"
 
@@ -3094,19 +3099,19 @@ msgstr ""
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:246
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Allow whispers"
 msgstr "允许密语"
 
-#: src/gui/setup_relations.cpp:251
+#: src/gui/setup_relations.cpp:252
 msgid "Relations"
 msgstr "关系"
 
-#: src/gui/setup_relations.cpp:273
+#: src/gui/setup_relations.cpp:277
 msgid "When ignoring:"
 msgstr "当忽略时："
 
@@ -3254,105 +3259,118 @@ msgstr "字体大小"
 msgid "Npc font size"
 msgstr ""
 
+#. TRANSLATORS: button name with information about selected theme
 #: src/gui/setup_theme.cpp:199
+msgid "i"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:201
 msgid "Theme"
 msgstr "主题"
 
-#: src/gui/setup_theme.cpp:362
+#: src/gui/setup_theme.cpp:365
+msgid "Theme info"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:386
 msgid "Theme Changed"
 msgstr "主题更改"
 
-#: src/gui/setup_theme.cpp:362 src/gui/setup_video.cpp:500
-#: src/gui/setup_video.cpp:507
+#: src/gui/setup_theme.cpp:386 src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "软件"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "快速的OpenGL"
 
-#: src/gui/setup_video.cpp:203
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "安全的OpenGL"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:201
+msgid "Mobile OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:234
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:239
+#: src/gui/setup_video.cpp:237
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:239
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:241
+#: src/gui/setup_video.cpp:240
 msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:245 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:437 src/gui/setup_video.cpp:552
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:272
+#: src/gui/setup_video.cpp:441 src/gui/setup_video.cpp:556
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246
+#: src/gui/setup_video.cpp:245
 msgid "Detect best mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
-#: src/gui/setup_video.cpp:436 src/gui/setup_video.cpp:538
-#: src/gui/setup_video.cpp:550
+#: src/gui/setup_video.cpp:270 src/gui/setup_video.cpp:273
+#: src/gui/setup_video.cpp:440 src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:554
 msgid "None"
 msgstr "w"
 
-#: src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:373
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
 
-#: src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:379
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:386
+#: src/gui/setup_video.cpp:390
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:391
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:403
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
-#: src/gui/setup_video.cpp:400
+#: src/gui/setup_video.cpp:404
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:475
+#: src/gui/setup_video.cpp:479
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/setup_video.cpp:476
+#: src/gui/setup_video.cpp:480
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:"
 
-#: src/gui/setup_video.cpp:499 src/gui/setup_video.cpp:506
+#: src/gui/setup_video.cpp:503 src/gui/setup_video.cpp:510
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:505
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3472,6 +3490,10 @@ msgstr ""
 msgid "Center game window"
 msgstr ""
 
+#: src/gui/setup_visual.cpp:114
+msgid "Allow screensaver to run"
+msgstr ""
+
 #: src/gui/shopwindow.cpp:75
 msgid "Personal Shop"
 msgstr "个人商店"
@@ -3488,322 +3510,322 @@ msgstr "出售物品"
 msgid "Announce"
 msgstr "公布"
 
-#: src/gui/shopwindow.cpp:97
+#: src/gui/shopwindow.cpp:98
 msgid "Show links in announce"
 msgstr "显示在公布的联系"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:153
 msgid "Auction"
 msgstr "拍卖"
 
-#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:103
+#: src/gui/shopwindow.cpp:770 src/net/ea/tradehandler.cpp:103
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/shopwindow.cpp:767
+#: src/gui/shopwindow.cpp:770
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗？"
 
-#: src/gui/skilldialog.cpp:227 src/gui/windowmenu.cpp:93
+#: src/gui/skilldialog.cpp:232 src/gui/windowmenu.cpp:92
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:232
+#: src/gui/skilldialog.cpp:237
 msgid "Up"
 msgstr "升级"
 
-#: src/gui/skilldialog.cpp:340
+#: src/gui/skilldialog.cpp:345
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
-#: src/gui/skilldialog.cpp:383
+#: src/gui/skilldialog.cpp:388
 msgid "basic"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:384
+#: src/gui/skilldialog.cpp:389
 msgid "Skill: basic, Id: 1"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:420
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:433
+#: src/gui/skilldialog.cpp:438
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
-#: src/gui/skilldialog.cpp:439
+#: src/gui/skilldialog.cpp:444
 #, c-format
 msgid "Skill: %s, Id: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:510 src/gui/skilldialog.cpp:601
+#: src/gui/skilldialog.cpp:515 src/gui/skilldialog.cpp:606
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
 
-#: src/gui/skilldialog.cpp:593
+#: src/gui/skilldialog.cpp:598
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "等级: %d（%+d）"
 
-#: src/gui/socialwindow.cpp:142 src/gui/socialwindow.cpp:248
-#: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:251
+#: src/gui/widgets/guildchattab.cpp:40 src/net/ea/gui/guildtab.cpp:47
 msgid "Guild"
 msgstr "帮会"
 
-#: src/gui/socialwindow.cpp:178
+#: src/gui/socialwindow.cpp:180
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "邀请用户%s加入公会%s"
 
-#: src/gui/socialwindow.cpp:192
+#: src/gui/socialwindow.cpp:194
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "退出公会%s的请求。"
 
-#: src/gui/socialwindow.cpp:218
+#: src/gui/socialwindow.cpp:220
 msgid "Member Invite to Guild"
 msgstr "会员邀请到公会"
 
-#: src/gui/socialwindow.cpp:219
+#: src/gui/socialwindow.cpp:221
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "你要邀请谁加入工会%s?"
 
-#: src/gui/socialwindow.cpp:228
+#: src/gui/socialwindow.cpp:230
 msgid "Leave Guild?"
 msgstr "离开公会？"
 
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你确定要离开工会%s吗？"
 
-#: src/gui/socialwindow.cpp:310 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:314 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "t"
 
-#: src/gui/socialwindow.cpp:345
+#: src/gui/socialwindow.cpp:349
 #, c-format
 msgid "Invited user %s to party."
 msgstr "邀请用户%s加入团队."
 
-#: src/gui/socialwindow.cpp:359
+#: src/gui/socialwindow.cpp:363
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:385
+#: src/gui/socialwindow.cpp:389
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:386
+#: src/gui/socialwindow.cpp:390
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:399
 msgid "Leave Party?"
 msgstr "离开团队?"
 
-#: src/gui/socialwindow.cpp:396
+#: src/gui/socialwindow.cpp:400
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:630
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:962
+#: src/gui/socialwindow.cpp:969
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:995
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:996
 msgid "Attack mobs"
 msgstr "攻击暴徒"
 
-#: src/gui/socialwindow.cpp:990
+#: src/gui/socialwindow.cpp:997
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:1020
+#: src/gui/socialwindow.cpp:1028
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:1054
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1047
+#: src/gui/socialwindow.cpp:1055
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1173
+#: src/gui/socialwindow.cpp:1182
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:1174 src/gui/socialwindow.cpp:1634
+#: src/gui/socialwindow.cpp:1183 src/gui/socialwindow.cpp:1650
 msgid "Create Party"
 msgstr "建立"
 
-#: src/gui/socialwindow.cpp:1218 src/gui/windowmenu.cpp:105
+#: src/gui/socialwindow.cpp:1227 src/gui/windowmenu.cpp:104
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1228
+#: src/gui/socialwindow.cpp:1237
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1232
+#: src/gui/socialwindow.cpp:1242
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1236
+#: src/gui/socialwindow.cpp:1246
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gui/socialwindow.cpp:1417
+#: src/gui/socialwindow.cpp:1433
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
-#: src/gui/socialwindow.cpp:1427
+#: src/gui/socialwindow.cpp:1443
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
-#: src/gui/socialwindow.cpp:1444
+#: src/gui/socialwindow.cpp:1460
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
-#: src/gui/socialwindow.cpp:1457
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1520
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
-#: src/gui/socialwindow.cpp:1527
+#: src/gui/socialwindow.cpp:1543
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
-#: src/gui/socialwindow.cpp:1541
+#: src/gui/socialwindow.cpp:1557
 msgid "Guild Name"
 msgstr "公会名称"
 
-#: src/gui/socialwindow.cpp:1542
+#: src/gui/socialwindow.cpp:1558
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
-#: src/gui/socialwindow.cpp:1556
+#: src/gui/socialwindow.cpp:1572
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1578
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s"
 
-#: src/gui/socialwindow.cpp:1568
+#: src/gui/socialwindow.cpp:1584
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
-#: src/gui/socialwindow.cpp:1583
+#: src/gui/socialwindow.cpp:1599
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:1594
+#: src/gui/socialwindow.cpp:1610
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党。"
 
-#: src/gui/socialwindow.cpp:1598
+#: src/gui/socialwindow.cpp:1614
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1622
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:1611
+#: src/gui/socialwindow.cpp:1627
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:1620
+#: src/gui/socialwindow.cpp:1636
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1651
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/socialwindow.cpp:1640
+#: src/gui/socialwindow.cpp:1656
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1641
+#: src/gui/socialwindow.cpp:1657
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
-#: src/gui/specialswindow.cpp:78 src/gui/windowmenu.cpp:100
+#: src/gui/specialswindow.cpp:75 src/gui/windowmenu.cpp:99
 msgid "Specials"
 msgstr "特价商品"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:270
-#: src/gui/statuswindow.cpp:318
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:320
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:135
 msgid "HP:"
 msgstr "HP："
 
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:137
 msgid "Exp:"
 msgstr "经验："
 
-#: src/gui/statuswindow.cpp:189
+#: src/gui/statuswindow.cpp:191
 msgid "MP:"
 msgstr "MP："
 
-#: src/gui/statuswindow.cpp:221 src/gui/statuswindow.cpp:405
+#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
-#: src/gui/statuswindow.cpp:222
+#: src/gui/statuswindow.cpp:224
 msgid "Job:"
 msgstr "职业："
 
-#: src/gui/statuswindow.cpp:273 src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
 #, c-format
 msgid "Character points: %d"
 msgstr "角色可用点: %d"
 
-#: src/gui/statuswindow.cpp:339
+#: src/gui/statuswindow.cpp:341
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -3896,48 +3918,48 @@ msgstr "学校层次："
 msgid "Save"
 msgstr "保存"
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "打算交易"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中……"
 
-#: src/gui/tradewindow.cpp:59
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "同意交易"
 
-#: src/gui/tradewindow.cpp:60
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "已同意。等待中……"
 
-#: src/gui/tradewindow.cpp:63
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "交易：你"
 
-#: src/gui/tradewindow.cpp:70 src/gui/tradewindow.cpp:170
+#: src/gui/tradewindow.cpp:69 src/gui/tradewindow.cpp:169
 #, c-format
 msgid "You get %s"
 msgstr "你得到%s"
 
-#: src/gui/tradewindow.cpp:73
+#: src/gui/tradewindow.cpp:72
 msgid "Change"
 msgstr "改变"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:114
 msgid "You give:"
 msgstr "你给予："
 
-#: src/gui/tradewindow.cpp:383
+#: src/gui/tradewindow.cpp:382
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
-#: src/gui/tradewindow.cpp:464
+#: src/gui/tradewindow.cpp:463
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
-#: src/gui/unregisterdialog.cpp:56
+#: src/gui/unregisterdialog.cpp:55
 #, c-format
 msgid "Name: %s"
 msgstr "姓名：%s"
@@ -4124,7 +4146,7 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:77 src/gui/whoisonline.cpp:619
+#: src/gui/whoisonline.cpp:77 src/gui/whoisonline.cpp:620
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -4136,15 +4158,15 @@ msgstr "更新"
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:633
+#: src/gui/whoisonline.cpp:634
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:673
+#: src/gui/whoisonline.cpp:674
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
-#: src/gui/widgets/battletab.cpp:43
+#: src/gui/widgets/battletab.cpp:41
 msgid "Battle"
 msgstr "战斗"
 
@@ -4205,10 +4227,10 @@ msgid "This command makes <nick> a channel operator."
 msgstr "该命令使<昵称>成为频道管理员。"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:64 src/net/ea/gui/guildtab.cpp:70
-#: src/net/ea/gui/partytab.cpp:88
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:66
+#: src/net/ea/gui/partytab.cpp:84
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
+msgstr "如果<昵称>包含空格，请用双引号(\")括起。"
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
@@ -4230,172 +4252,177 @@ msgstr "需要一个用户来操作"
 msgid "Need a user to kick!"
 msgstr "踢人时需要指定用户！"
 
-#: src/gui/widgets/chattab.cpp:149
+#: src/gui/widgets/chattab.cpp:148
 msgid "Global announcement:"
 msgstr "全局公告："
 
-#: src/gui/widgets/chattab.cpp:155
+#: src/gui/widgets/chattab.cpp:154
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 全局公告："
 
-#: src/gui/widgets/chattab.cpp:182
+#: src/gui/widgets/chattab.cpp:181
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
-#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:68
-#: src/net/ea/gui/partytab.cpp:86
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:64
+#: src/net/ea/gui/partytab.cpp:82
 msgid "Command: /invite <nick>"
 msgstr "命令：/invite <昵称>"
 
-#: src/gui/widgets/guildchattab.cpp:63 src/net/ea/gui/guildtab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:65
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:69 src/net/ea/gui/guildtab.cpp:75
-#: src/net/ea/gui/partytab.cpp:93
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:71
+#: src/net/ea/gui/partytab.cpp:89
 msgid "Command: /leave"
 msgstr "命令：/leave"
 
-#: src/gui/widgets/guildchattab.cpp:70 src/net/ea/gui/guildtab.cpp:76
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:72
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:136
-#: src/net/ea/gui/partytab.cpp:72
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:132
+#: src/net/ea/gui/partytab.cpp:68
 msgid "/help > Display this help."
 msgstr "/help > 显示该帮助信息。"
 
-#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:133
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > "
 
-#: src/gui/widgets/guildchattab.cpp:114 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:134
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > "
 
-#: src/gui/widgets/guildchattab.cpp:115 src/net/ea/gui/guildtab.cpp:139
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:135
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick >"
 
+#. TRANSLATORS: Text under equipped items (should be small)
+#: src/gui/widgets/itemcontainer.cpp:304
+msgid "Eq."
+msgstr ""
+
 #: src/gui/widgets/itemlinkhandler.cpp:99
 msgid "Open url"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:105
+#: src/gui/widgets/whispertab.cpp:103
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > "
 
-#: src/gui/widgets/whispertab.cpp:106
+#: src/gui/widgets/whispertab.cpp:104
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > 停止忽视了其他"
 
-#: src/gui/widgets/whispertab.cpp:107
+#: src/gui/widgets/whispertab.cpp:105
 msgid "/close > Close the whisper tab"
 msgstr "/close > 关闭密语标签页"
 
-#: src/gui/widgets/whispertab.cpp:117
+#: src/gui/widgets/whispertab.cpp:115
 msgid "Command: /close"
 msgstr "命令: /close"
 
-#: src/gui/widgets/whispertab.cpp:118
+#: src/gui/widgets/whispertab.cpp:116
 msgid "This command closes the current whisper tab."
 msgstr "该命令关闭当前密语标签页。"
 
-#: src/gui/widgets/whispertab.cpp:122
+#: src/gui/widgets/whispertab.cpp:120
 msgid "Command: /ignore"
 msgstr "命令：/ignore"
 
-#: src/gui/widgets/whispertab.cpp:123
+#: src/gui/widgets/whispertab.cpp:121
 msgid "This command ignores the other player regardless of current relations."
 msgstr "此命令忽略了其他，不管目前的关系。"
 
-#: src/gui/widgets/whispertab.cpp:128
+#: src/gui/widgets/whispertab.cpp:126
 msgid "Command: /unignore <player>"
 msgstr "命令: /unignore <玩家>"
 
-#: src/gui/widgets/whispertab.cpp:129
+#: src/gui/widgets/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
 
-#: src/gui/windowmenu.cpp:75
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:75
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "谁在线"
 
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "QE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:78
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:78
 msgid "Bot checker"
 msgstr "挂机检查"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:80
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "表情符号"
 
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:85
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:87
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "SKI"
-msgstr ""
+msgstr "技能"
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:99
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:104
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:106
+#: src/gui/windowmenu.cpp:105
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:109
+#: src/gui/windowmenu.cpp:108
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:109
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:109
 msgid "Did you know"
 msgstr "你知道吗"
 
-#: src/gui/windowmenu.cpp:112
+#: src/gui/windowmenu.cpp:111
 msgid "SET"
 msgstr "SET"
 
@@ -4409,7 +4436,7 @@ msgstr ""
 
 #: src/gui/worldselectdialog.cpp:86
 msgid "Choose World"
-msgstr ""
+msgstr "选择世界"
 
 #: src/inputmanager.cpp:308 src/inputmanager.cpp:346 src/keyboardconfig.cpp:85
 #, c-format
@@ -4445,345 +4472,345 @@ msgstr "仓库"
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:365
+#: src/localplayer.cpp:366
 #, c-format
 msgid "You were killed by %s"
-msgstr ""
+msgstr "你被 %s 杀掉了"
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1425
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1425
+#: src/localplayer.cpp:1428
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1431
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1431
+#: src/localplayer.cpp:1434
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1437
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1437
+#: src/localplayer.cpp:1440
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1461
+#: src/localplayer.cpp:1464
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:1668 src/localplayer.cpp:1702 src/localplayer.cpp:1703
+#: src/localplayer.cpp:1671 src/localplayer.cpp:1705 src/localplayer.cpp:1706
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1708 src/localplayer.cpp:1715 src/localplayer.cpp:1722
+#: src/localplayer.cpp:1711 src/localplayer.cpp:1718 src/localplayer.cpp:1725
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1909
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1931
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
-#: src/localplayer.cpp:1936
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1940
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1965
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1966
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1985
+#: src/localplayer.cpp:1988
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1986
+#: src/localplayer.cpp:1989
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2005 src/localplayer.cpp:2009 src/localplayer.cpp:2032
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2012 src/localplayer.cpp:2035
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/localplayer.cpp:2006 src/localplayer.cpp:2028
+#: src/localplayer.cpp:2009 src/localplayer.cpp:2031
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2007
+#: src/localplayer.cpp:2010
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2008
+#: src/localplayer.cpp:2011
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/localplayer.cpp:2030
+#: src/localplayer.cpp:2033
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2031
+#: src/localplayer.cpp:2034
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2089
+#: src/localplayer.cpp:2092
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2090
+#: src/localplayer.cpp:2093
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2110
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2111
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2131
+#: src/localplayer.cpp:2134
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2135
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) 攻击所有玩家"
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2157
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2158
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2175
+#: src/localplayer.cpp:2178
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2176
+#: src/localplayer.cpp:2179
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2204
+#: src/localplayer.cpp:2207
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:2224
+#: src/localplayer.cpp:2227
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2225
+#: src/localplayer.cpp:2228
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2226 src/localplayer.cpp:2241
+#: src/localplayer.cpp:2229 src/localplayer.cpp:2244
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2242
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2243
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2266
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2267
+#: src/localplayer.cpp:2270
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3797
+#: src/localplayer.cpp:3800
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3799 src/localplayer.cpp:3814
+#: src/localplayer.cpp:3802 src/localplayer.cpp:3817
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3806
+#: src/localplayer.cpp:3809
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3808 src/localplayer.cpp:3816
+#: src/localplayer.cpp:3811 src/localplayer.cpp:3819
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4173
+#: src/localplayer.cpp:4176
 msgid "You see "
 msgstr "你看"
 
@@ -5116,43 +5143,43 @@ msgstr ""
 msgid "%s has kicked from your guild."
 msgstr "%s已经被工会开除."
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:69
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > 邀请某一玩家加入您的帮会"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > 离开你所在的帮会"
 
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > 把某人踢出你所在的帮会"
 
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > 显示/改变帮会项目共享选项"
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > 显示/改变帮会经验共享选项"
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:83
 msgid "This command invites <nick> to party with you."
 msgstr "该命令邀请<昵称>和你聚会。"
 
-#: src/net/ea/gui/partytab.cpp:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "This command causes the player to leave the party."
 msgstr "该命令致使玩家离开帮会"
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /item <policy>"
 msgstr "命令：/item <策略>"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's item sharing policy."
 msgstr "改命令改变帮会的物品共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -5160,23 +5187,23 @@ msgstr ""
 "<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\","
 "\"false\"用来禁止物品共享。"
 
-#: src/net/ea/gui/partytab.cpp:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /item"
 msgstr "命令：/item"
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current item sharing policy."
 msgstr "该命令显示帮会现有的物品共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:106
 msgid "Command: /exp <policy>"
 msgstr "命令：/exp <策略>"
 
-#: src/net/ea/gui/partytab.cpp:111
+#: src/net/ea/gui/partytab.cpp:107
 msgid "This command changes the party's experience sharing policy."
 msgstr "该命令改变帮会的经验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:109
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -5184,43 +5211,43 @@ msgstr ""
 "<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\","
 "\"false\"用来关闭经验共享。"
 
-#: src/net/ea/gui/partytab.cpp:116
+#: src/net/ea/gui/partytab.cpp:112
 msgid "Command: /exp"
 msgstr "命令：/exp"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:113
 msgid "This command displays the party's current experience sharing policy."
 msgstr "该命令显示帮会现有的经验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:280
+#: src/net/ea/gui/partytab.cpp:147 src/net/ea/partyhandler.cpp:280
 msgid "Item sharing enabled."
 msgstr "物品共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:290
+#: src/net/ea/gui/partytab.cpp:150 src/net/ea/partyhandler.cpp:290
 msgid "Item sharing disabled."
 msgstr "物品共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:157 src/net/ea/partyhandler.cpp:300
+#: src/net/ea/gui/partytab.cpp:153 src/net/ea/partyhandler.cpp:300
 msgid "Item sharing not possible."
 msgstr "物品共享不可能。"
 
-#: src/net/ea/gui/partytab.cpp:160
+#: src/net/ea/gui/partytab.cpp:156
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:242
+#: src/net/ea/gui/partytab.cpp:186 src/net/ea/partyhandler.cpp:242
 msgid "Experience sharing enabled."
 msgstr "经验共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:252
+#: src/net/ea/gui/partytab.cpp:189 src/net/ea/partyhandler.cpp:252
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:196 src/net/ea/partyhandler.cpp:262
+#: src/net/ea/gui/partytab.cpp:192 src/net/ea/partyhandler.cpp:262
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能。"
 
-#: src/net/ea/gui/partytab.cpp:199
+#: src/net/ea/gui/partytab.cpp:195
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -5587,11 +5614,11 @@ msgstr "无法偷取任何物品..."
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
-#: src/net/eathena/adminhandler.cpp:65 src/net/tmwa/adminhandler.cpp:65
+#: src/net/eathena/adminhandler.cpp:66 src/net/tmwa/adminhandler.cpp:65
 msgid "Kick failed!"
 msgstr "踢出失败！"
 
-#: src/net/eathena/adminhandler.cpp:67 src/net/tmwa/adminhandler.cpp:67
+#: src/net/eathena/adminhandler.cpp:68 src/net/tmwa/adminhandler.cpp:67
 msgid "Kick succeeded!"
 msgstr "成功踢出！"
 
@@ -5800,19 +5827,19 @@ msgstr "交易取消。"
 msgid "Trade completed."
 msgstr "交易完成。"
 
-#: src/playerrelations.cpp:488
+#: src/playerrelations.cpp:489
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:510
+#: src/playerrelations.cpp:511
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:555
+#: src/playerrelations.cpp:556
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:558
+#: src/playerrelations.cpp:559
 msgid "Floating bubble"
 msgstr "流动的泡沫"