Update and rebuild translations.

1 files changed, 552 insertions, 524 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2c7dcc85f..135d763bb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,12 +5,13 @@
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <colorfullife81@gmail.com>, 2011.
+# 昕 邹 <sin2624+transifex@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-01 01:22+0300\n"
-"PO-Revision-Date: 2011-09-30 14:45+0000\n"
+"POT-Creation-Date: 2011-10-15 00:08+0300\n"
+"PO-Revision-Date: 2011-10-14 21:11+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "team/zh_CN/)\n"
@@ -20,35 +21,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1133
+#: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "在地图上可见"
 
-#: src/being.cpp:547
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:547
+#: src/being.cpp:548
 msgid "miss"
-msgstr "小姐"
+msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1526
+#: src/being.cpp:1527
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1531
+#: src/being.cpp:1532
 msgid "I"
 msgstr "I"
 
 #: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
-msgstr "设置"
+msgstr "魔法攻击"
 
 #: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
-msgstr "Perfomance"
+msgstr "性能"
 
 #: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
@@ -56,23 +57,23 @@ msgstr "视频"
 
 #: src/client.cpp:852
 msgid "Themes"
-msgstr ""
+msgstr "主题"
 
 #: src/client.cpp:934
 msgid "Connecting to server"
-msgstr "连接到服务器"
+msgstr "魔法防御"
 
 #: src/client.cpp:965
 msgid "Logging in"
-msgstr "登录"
+msgstr "尝试捡起不存在的物品。"
 
 #: src/client.cpp:998
 msgid "Entering game world"
-msgstr "进入游戏世界"
+msgstr "捡起物品发生不存在的物品。"
 
 #: src/client.cpp:1098
 msgid "Requesting characters"
-msgstr "请求字符"
+msgstr "请求角色"
 
 #: src/client.cpp:1129
 msgid "Connecting to the game server"
@@ -94,7 +95,7 @@ msgstr "错误"
 
 #: src/client.cpp:1198
 msgid "Requesting registration details"
-msgstr "申请登记的详细信息"
+msgstr "请求注册的详细信息"
 
 #: src/client.cpp:1224
 msgid "Password Change"
@@ -102,15 +103,15 @@ msgstr "密码更改"
 
 #: src/client.cpp:1225
 msgid "Password changed successfully!"
-msgstr "密码成功！"
+msgstr "更改密码成功！"
 
 #: src/client.cpp:1244
 msgid "Email Change"
-msgstr "电子邮件变更"
+msgstr "更改电子邮件"
 
 #: src/client.cpp:1245
 msgid "Email changed successfully!"
-msgstr "电子邮件已变更成功！"
+msgstr "更改电子邮件成功！"
 
 #: src/client.cpp:1265
 msgid "Unregister Successful"
@@ -118,18 +119,18 @@ msgstr "注销成功"
 
 #: src/client.cpp:1266
 msgid "Farewell, come back any time..."
-msgstr "永别了，任何时候回来... ..."
+msgstr "再见，随时欢迎回来... ..."
 
 #: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
 #: src/client.cpp:1935 src/client.cpp:1942
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s 不存在，并且无法创建！退出。"
 
 #: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
-msgstr ""
+msgstr "无效的更新主机: %s"
 
 #: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
@@ -138,164 +139,168 @@ msgstr "创建更新目录错误！"
 #: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "错误：%s 不存在并且无法创建！退出。"
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:198
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:295
+#: src/commandhandler.cpp:297
 msgid "Cannot send empty whispers!"
 msgstr "无法发送空白密语！"
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:311
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:329
+#: src/commandhandler.cpp:331
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:356
+#: src/commandhandler.cpp:358
 msgid "Guild name is missing."
 msgstr "公会名称是缺少的。"
 
-#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
-#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
+#: src/commandhandler.cpp:371 src/commandhandler.cpp:483
+#: src/commandhandler.cpp:524 src/commandhandler.cpp:559
 msgid "Please specify a name."
 msgstr "请指定一个名称。"
 
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
 msgid "Message closes chat."
 msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:426
+#: src/commandhandler.cpp:428
 msgid "Return now toggles chat."
 msgstr "<回车>键现在切换聊天。"
 
-#: src/commandhandler.cpp:432
+#: src/commandhandler.cpp:434
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:460
+#: src/commandhandler.cpp:462
 msgid "friend"
 msgstr "朋友"
 
-#: src/commandhandler.cpp:465
+#: src/commandhandler.cpp:467
 msgid "disregarded"
 msgstr "无视"
 
-#: src/commandhandler.cpp:470
+#: src/commandhandler.cpp:472
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:489
+#: src/commandhandler.cpp:491
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:513
 #, c-format
 msgid "Player could not be %s!"
-msgstr ""
+msgstr "玩家不能为 %s"
 
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:536
 msgid "Player wasn't ignored!"
 msgstr "是不能忽视的！"
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:543
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽略！"
 
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:545
 msgid "Player could not be unignored!"
 msgstr "玩家不能被忽略!"
 
-#: src/commandhandler.cpp:559
+#: src/commandhandler.cpp:551
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:566
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
-#: src/commandhandler.cpp:570
+#: src/commandhandler.cpp:577
 msgid "Player successfully erased!"
-msgstr ""
+msgstr "玩家成功删除！"
 
-#: src/commandhandler.cpp:572
+#: src/commandhandler.cpp:579
 msgid "Player could not be erased!"
-msgstr ""
+msgstr "玩家无法删除！"
 
-#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
+#: src/commandhandler.cpp:879 src/commandhandler.cpp:925
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:882
+#: src/commandhandler.cpp:889
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:891
+#: src/commandhandler.cpp:898
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:899
+#: src/commandhandler.cpp:906
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:907
+#: src/commandhandler.cpp:914
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:915
+#: src/commandhandler.cpp:922
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:994
+#: src/commandhandler.cpp:1001
 msgid "font cache size"
-msgstr ""
+msgstr "字体缓存大小"
 
-#: src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:1013
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1010
+#: src/commandhandler.cpp:1017
 msgid "Created:"
 msgstr "创建于："
 
-#: src/commandhandler.cpp:1012
+#: src/commandhandler.cpp:1019
 msgid "Deleted:"
 msgstr "删除："
 
-#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
+#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -304,11 +309,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405
 msgid "Debug"
 msgstr "调试 "
 
@@ -324,23 +329,23 @@ msgstr "保存屏幕快照失败！"
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1321
+#: src/game.cpp:1323
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1331
+#: src/game.cpp:1333
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1731
+#: src/game.cpp:1733
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1732
+#: src/game.cpp:1734
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -367,26 +372,26 @@ msgstr "评论: %s"
 
 #: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr "机器人检查"
+msgstr "挂机检查"
 
 #: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "姓名"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
 msgid "Attack"
 msgstr "攻击"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "说话"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
 msgid "Move"
 msgstr "移动"
 
@@ -399,8 +404,8 @@ msgid "Reset"
 msgstr "重置"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
 msgid "Buy"
 msgstr "购买"
 
@@ -418,7 +423,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
 msgid "+"
 msgstr "+"
 
@@ -426,7 +431,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
 msgid "-"
 msgstr "-"
 
@@ -439,7 +444,7 @@ msgstr "退出"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
 msgid "Max"
 msgstr "最大"
 
@@ -448,8 +453,8 @@ msgstr "最大"
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
-#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -458,15 +463,15 @@ msgstr "出售"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
-#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
-#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
-#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
-#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
-#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
+#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -637,7 +642,7 @@ msgid "Enter password:"
 msgstr "输入密码："
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "删除"
@@ -713,7 +718,7 @@ msgstr "彩虹3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
@@ -724,12 +729,12 @@ msgstr "？？？"
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:609
+#: src/gui/chatwindow.cpp:610
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:996
+#: src/gui/chatwindow.cpp:997
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -743,9 +748,10 @@ msgid "No"
 msgstr "否"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
-#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
-#: src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
 msgid "Ignore"
 msgstr "忽略"
 
@@ -891,7 +897,7 @@ msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "关闭"
 
@@ -918,8 +924,8 @@ msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1831
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -961,50 +967,50 @@ msgid "Filter:"
 msgstr "过滤器："
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
+#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
 msgid "Equip"
 msgstr "装备"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
-#: src/gui/popupmenu.cpp:1799
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1837
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1842
 msgid "Drop..."
 msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
 msgid "Split"
 msgstr "分离"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:537
 msgid "Outfits"
-msgstr "装具"
+msgstr "套装"
 
 #: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "重量："
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
-#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
-#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丢弃"
@@ -1035,11 +1041,11 @@ msgstr "请选择你分离的物品的数量"
 
 #: src/gui/itemamountwindow.cpp:276
 msgid "Add to buy shop."
-msgstr ""
+msgstr "添加到购买商店。"
 
 #: src/gui/itemamountwindow.cpp:279
 msgid "Add to sell shop."
-msgstr ""
+msgstr "添加到出售商店。"
 
 #: src/gui/itemamountwindow.cpp:282
 msgid "Unknown."
@@ -1140,7 +1146,7 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
 msgid "You have left the guild."
 msgstr "你已经离开工会."
 
@@ -1195,7 +1201,7 @@ msgstr "法力栏"
 
 #: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
-msgstr ""
+msgstr "经验条"
 
 #: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
@@ -1242,7 +1248,7 @@ msgstr "提交"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
 msgid "Clear"
 msgstr "清除"
 
@@ -1265,12 +1271,12 @@ msgstr "发送信件失败或者信件无效。"
 #: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
 #, c-format
 msgid "Outfit: %d"
-msgstr ""
+msgstr "套装： %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
 #, c-format
 msgid "Key: %s"
-msgstr ""
+msgstr "按键：%s"
 
 #: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
@@ -1280,321 +1286,331 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
 msgid "Whisper"
 msgstr "密语"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
 msgid "Heal"
 msgstr "愈合"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:624
 msgid "Be friend"
 msgstr "是朋友"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
-#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
-#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
-#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
+#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:653
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
-#: src/playerrelations.cpp:418
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
+#: src/playerrelations.cpp:421
 msgid "Completely ignore"
 msgstr "完全忽略"
 
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
+#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
 msgid "Follow"
 msgstr "按照"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:705
 msgid "Kick from party"
 msgstr "踢从党"
 
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
-#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
 msgid "Kick from guild"
 msgstr "踢从公会"
 
-#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
-#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
+#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
-#: src/gui/popupmenu.cpp:709
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:736
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:250
 msgid "Kick player"
 msgstr "踢球员"
 
-#: src/gui/popupmenu.cpp:243
+#: src/gui/popupmenu.cpp:252
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
-#: src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:759
 msgid "Show Items"
 msgstr "显示项目"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
-#: src/gui/popupmenu.cpp:734
+#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:761
 msgid "Add comment"
 msgstr "发表评论"
 
-#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
 msgid "Buy (?)"
 msgstr "购买(?)"
 
-#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
 msgid "Sell (?)"
 msgstr "出售(?)"
 
-#: src/gui/popupmenu.cpp:288
+#: src/gui/popupmenu.cpp:297
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:299
+#: src/gui/popupmenu.cpp:308
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:313
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
-#: src/gui/popupmenu.cpp:306
+#: src/gui/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:317
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:500
 msgid "Pick up"
 msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
+#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
 msgid "Add to chat"
 msgstr "加入聊天"
 
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:518
 msgid "Map Item"
 msgstr "地图项"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 msgid "Rename"
 msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
+#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
+#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507
+#: src/gui/popupmenu.cpp:525
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:538
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "法术"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:555
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:556
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:562
+#: src/gui/popupmenu.cpp:580
 msgid "Disable highlight"
 msgstr "禁用"
 
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:582
 msgid "Enable highlight"
 msgstr "启用突出"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:584
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568
+#: src/gui/popupmenu.cpp:586
 msgid "Remove name"
-msgstr ""
+msgstr "移除姓名"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:588
 msgid "Enable away"
 msgstr "启用远"
 
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "留下"
 
-#: src/gui/popupmenu.cpp:753
+#: src/gui/popupmenu.cpp:780
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1205
+#: src/gui/popupmenu.cpp:1243
 msgid "Rename map sign          "
 msgstr "重命名的地图标志"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1245
 msgid "Name:                    "
 msgstr "名称："
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1257
+#: src/gui/popupmenu.cpp:1295
 msgid "Player comment            "
 msgstr "玩家评论"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1259
+#: src/gui/popupmenu.cpp:1297
 msgid "Comment:                      "
 msgstr "评论："
 
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1668
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1672
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1673
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1636
+#: src/gui/popupmenu.cpp:1674
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1684
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:1647
+#: src/gui/popupmenu.cpp:1685
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1686
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
+#: src/gui/popupmenu.cpp:1843
 msgid "Drop all"
 msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1687
+#: src/gui/popupmenu.cpp:1725
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1726
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1689
+#: src/gui/popupmenu.cpp:1727
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1821
+#: src/gui/popupmenu.cpp:1859
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
 msgid "Hide"
 msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
 msgid "Show"
 msgstr "显示"
 
-#: src/gui/popupmenu.cpp:1894
+#: src/gui/popupmenu.cpp:1932
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
+#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
 msgid "Move up"
 msgstr "x"
 
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
+#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
 msgid "Move down"
 msgstr ""
 
@@ -1689,7 +1705,7 @@ msgstr "准备下载"
 
 #: src/gui/serverdialog.cpp:573
 msgid "Error retreiving server list!"
-msgstr "错误retreiving的服务器列表！"
+msgstr "恢复服务器列表错误！"
 
 #: src/gui/serverdialog.cpp:678
 msgid "requires a newer version"
@@ -1798,7 +1814,7 @@ msgstr "消息"
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
-msgstr "隐藏商店的消息"
+msgstr "隐藏商店消息"
 
 #: src/gui/setup_chat.cpp:94
 msgid "Tabs"
@@ -1848,6 +1864,10 @@ msgstr "其他"
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:128
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "这就是该色彩看起来的样子"
@@ -2081,7 +2101,7 @@ msgstr "接受出售/购买请求"
 
 #: src/gui/setup_other.cpp:147
 msgid "Enable shop mode"
-msgstr "启用店模式"
+msgstr "启用商店模式"
 
 #: src/gui/setup_other.cpp:153
 msgid "Log NPC dialogue"
@@ -2089,11 +2109,11 @@ msgstr "NPC对话"
 
 #: src/gui/setup_other.cpp:157
 msgid "Bots support"
-msgstr ""
+msgstr "挂机支持"
 
 #: src/gui/setup_other.cpp:159
 msgid "Enable auction bot support"
-msgstr ""
+msgstr "启用拍卖挂机支持"
 
 #: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
@@ -2105,7 +2125,7 @@ msgstr "启用服务器端的攻击"
 
 #: src/gui/setup_other.cpp:171
 msgid "Enable bot checker"
-msgstr "启用BOT检查"
+msgstr "启用挂机检查"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection"
@@ -2245,25 +2265,29 @@ msgstr "忽略"
 
 #: src/gui/setup_relations.cpp:74
 msgid "Erased"
+msgstr "已删除"
+
+#: src/gui/setup_relations.cpp:75
+msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:238
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "允许密语"
 
-#: src/gui/setup_relations.cpp:243
+#: src/gui/setup_relations.cpp:244
 msgid "Old"
 msgstr "旧"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:246
 msgid "Relations"
 msgstr "关系"
 
-#: src/gui/setup_relations.cpp:270
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "当忽略时："
 
@@ -2317,11 +2341,11 @@ msgstr "帮助字体"
 
 #: src/gui/setup_theme.cpp:150
 msgid "Secure font"
-msgstr ""
+msgstr "安全字体"
 
 #: src/gui/setup_theme.cpp:151
 msgid "Japanese font"
-msgstr ""
+msgstr "日文字体"
 
 #: src/gui/setup_theme.cpp:183
 msgid "Font size"
@@ -2518,9 +2542,9 @@ msgstr "显示在公布的联系"
 
 #: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
 msgid "Auction"
-msgstr ""
+msgstr "拍卖"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "请求交易"
@@ -2819,182 +2843,186 @@ msgid "(A) moves to target in attack range"
 msgstr ""
 
 #: src/gui/statuspopup.cpp:289
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:294
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:302
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:306
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:310
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:314
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:318
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:332
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:337
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:354
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:358
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:362
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:380
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:384
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:388
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:392
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:396
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:400
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:404
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:408
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:417
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:421
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:425
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:429
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:433
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:437
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:441
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:449
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:454
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:459
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:464
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:469
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:473
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:482
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:486
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:490
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:499
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:502
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:513
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:517
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:521
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:537
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3046,18 +3074,18 @@ msgstr "级别:%d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
-#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
-#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
+#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
+#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
 msgid "(c)"
 msgstr "(c)"
 
@@ -3065,20 +3093,20 @@ msgstr "(c)"
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
 msgid "(d)"
 msgstr "(d)"
 
 #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
-#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
+#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
+#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674
+#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
 msgid "(a)"
 msgstr "(a)"
 
@@ -3094,7 +3122,7 @@ msgstr "(1)"
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
 msgid "(3)"
 msgstr "(3)"
 
@@ -3106,70 +3134,70 @@ msgstr "(5)"
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
-#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
+#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:716
+#: src/gui/statuswindow.cpp:719
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:722
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:725
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:736
+#: src/gui/statuswindow.cpp:739
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
-#: src/gui/statuswindow.cpp:860
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
+#: src/gui/statuswindow.cpp:863
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:768
+#: src/gui/statuswindow.cpp:771
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
+#: src/gui/statuswindow.cpp:866
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:807
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:824
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:827
+#: src/gui/statuswindow.cpp:830
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:836
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:839
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
+#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
 msgid "(O)"
 msgstr "(O)"
 
@@ -3485,7 +3513,7 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -3493,15 +3521,15 @@ msgstr "谁在线 - 更新"
 msgid "Update"
 msgstr "更新"
 
-#: src/gui/whoisonline.cpp:301
+#: src/gui/whoisonline.cpp:302
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:492
+#: src/gui/whoisonline.cpp:493
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:523
+#: src/gui/whoisonline.cpp:525
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -3674,7 +3702,7 @@ msgstr "此命令忽略了其他，不管目前的关系。"
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
-msgstr "命令: /uninore <>"
+msgstr "命令: /unignore <玩家>"
 
 #: src/gui/widgets/whispertab.cpp:131
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -3686,7 +3714,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
-msgstr "机器人检查"
+msgstr "挂机检查"
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3750,15 +3778,15 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "YK"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "你知道吗"
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
-msgstr ""
+msgstr "SET"
 
 #: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
@@ -3782,7 +3810,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:43
 msgid "Basic Keys"
-msgstr ""
+msgstr "基本按键"
 
 #: src/keyboardconfig.cpp:44
 msgid "Move Up"
@@ -3878,11 +3906,11 @@ msgstr "选择OK"
 
 #: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
-msgstr ""
+msgstr "快捷按键"
 
 #: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
-msgstr "项目的快捷方式键"
+msgstr "项目的快捷键"
 
 #: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
@@ -3901,7 +3929,7 @@ msgstr "物品快捷 %d"
 
 #: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
-msgstr ""
+msgstr "窗口按键"
 
 #: src/keyboardconfig.cpp:129
 msgid "Help Window"
@@ -3953,7 +3981,7 @@ msgstr "表情快捷窗口"
 
 #: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
-msgstr "装具窗口"
+msgstr "套装窗口"
 
 #: src/keyboardconfig.cpp:155
 msgid "Shop Window"
@@ -3973,7 +4001,7 @@ msgstr "命令的窗口"
 
 #: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
-msgstr "BOT检查窗口"
+msgstr "挂机检查窗口"
 
 #: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
@@ -3981,7 +4009,7 @@ msgstr "谁是在线窗口"
 
 #: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
-msgstr ""
+msgstr "你知道吗窗口"
 
 #: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
@@ -3993,7 +4021,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
-msgstr ""
+msgstr "表情按键"
 
 #: src/keyboardconfig.cpp:176
 msgid "Smilie"
@@ -4028,11 +4056,11 @@ msgstr "表情快捷键为 %d"
 
 #: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
-msgstr ""
+msgstr "套装按键"
 
 #: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
-msgstr ""
+msgstr "装备套装"
 
 #: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
@@ -4044,7 +4072,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
-msgstr ""
+msgstr "聊天按键"
 
 #: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
@@ -4088,7 +4116,7 @@ msgstr "停用聊天输入"
 
 #: src/keyboardconfig.cpp:299
 msgid "Other Keys"
-msgstr ""
+msgstr "其他按键"
 
 #: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
@@ -4116,11 +4144,11 @@ msgstr "直接对"
 
 #: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
-msgstr ""
+msgstr "疯狂移动"
 
 #: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
-msgstr ""
+msgstr "更改疯狂移动模式"
 
 #: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
@@ -4192,7 +4220,7 @@ msgstr "切换模式"
 
 #: src/keyboardconfig.cpp:348
 msgid "Modifier key"
-msgstr ""
+msgstr "修改按键"
 
 #: src/keyboardconfig.cpp:427
 #, c-format
@@ -4201,159 +4229,159 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:380
+#: src/localplayer.cpp:381
 msgid "You were killed by "
 msgstr "你被打死"
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1428
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1429
+#: src/localplayer.cpp:1430
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1431
+#: src/localplayer.cpp:1432
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1434
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1465
+#: src/localplayer.cpp:1466
 #, 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:3179
+#: src/localplayer.cpp:3181
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:3507
+#: src/localplayer.cpp:3509
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
+#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3516
+#: src/localplayer.cpp:3518
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3871
+#: src/localplayer.cpp:3873
 msgid "You see "
 msgstr "你看"
 
 #: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
-msgstr "manaplus [选项] [mana-file]"
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
 
 #: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
-msgstr "[mana-file] : The mana is an XML file (.mana)"
-
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
-msgstr "用于设置自定义参数"
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
 
 #: src/main.cpp:50
-msgid "              to the manaplus client."
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:51
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:53
 msgid "Options:"
 msgstr "选项："
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "  -l --log-file       : Log file to use"
 msgstr "-l--log-file 日志文件"
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:56
 msgid "  -v --version        : Display the version"
 msgstr "-v --version: 显示版本"
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "     --update-host    : Use this update host"
 msgstr "--update-host:    使用此更新主机"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:70
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:73
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:75
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4409,7 +4437,7 @@ msgstr ""
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "创建角色失败。很可能名称已被占用。"
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "错误的名称。"
 
@@ -4454,11 +4482,11 @@ msgstr "密语无法发送，%s离线。"
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:355
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr "MVP球员。"
 
-#: src/net/ea/chathandler.cpp:359
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr "MVP球员："
 
@@ -4491,81 +4519,81 @@ msgstr ""
 msgid "Unknown server response."
 msgstr "未知的服务器的响应。"
 
-#: src/net/ea/guildhandler.cpp:181
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
 msgid "Guild master: %s"
 msgstr "工会会长: %s"
 
-#: src/net/ea/guildhandler.cpp:185
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "工会等级: %d"
 
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr "在线玩家: %d"
 
-#: src/net/ea/guildhandler.cpp:189
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr "最大成员: %d"
 
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr "平均等级: %d"
 
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr "工会经验值: %d"
 
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "工会下一级所需经验: %d"
 
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:403
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:407
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:411
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr "用户现在是你们的工会成员了."
 
-#: src/net/ea/guildhandler.cpp:415
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:419
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr "未知工会邀请响应."
 
-#: src/net/ea/guildhandler.cpp:453
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr "%s已经离开工会."
 
-#: src/net/ea/guildhandler.cpp:484
+#: src/net/ea/guildhandler.cpp:498
 msgid "You was kicked from guild."
 msgstr "你已经被工会开除！."
 
-#: src/net/ea/guildhandler.cpp:497
+#: src/net/ea/guildhandler.cpp:511
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s已经被工会开除."
@@ -4678,11 +4706,11 @@ msgstr "经验共享不可能。"
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr "使用物品失败。"
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr "无法装备。"
 
@@ -4698,39 +4726,39 @@ msgstr "旧密码不正确。"
 msgid "New password too short."
 msgstr "新密码太短。"
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "未知的错误。"
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:203
 msgid "Unregistered ID."
 msgstr "未注册的ID。"
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:206
 msgid "Wrong password."
 msgstr "错误的密码。"
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:209
 msgid "Account expired."
 msgstr "账户过期失效。"
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:212
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:215
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "您已被永久禁止进入游戏。请联系GM团队。"
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:219
 msgid "Client too old."
 msgstr "客户端太旧。"
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:222
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4739,15 +4767,15 @@ msgstr ""
 "你被暂时禁止进入游戏直到%s.\n"
 "请通过论坛联系GM组"
 
-#: src/net/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:229
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:238
 msgid "Username permanently erased."
 msgstr ""
 
@@ -4789,305 +4817,305 @@ msgstr "%s不能加入团队，因为团队成员已满。"
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:354
+#: src/net/ea/partyhandler.cpp:357
 msgid "You have left the party."
 msgstr "你以退出帮会"
 
-#: src/net/ea/partyhandler.cpp:367
+#: src/net/ea/partyhandler.cpp:370
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已经离开你的帮会。"
 
-#: src/net/ea/partyhandler.cpp:446
+#: src/net/ea/partyhandler.cpp:447
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知成员尝试说：%s"
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "你已玩完了。"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "很遗憾的告诉您，您的角色在战斗中死亡了"
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "你再也不是那样的生机勃勃了。"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "游戏结束！"
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:102
 msgid "Insert coin to continue."
 msgstr "投入游戏币继续。"
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "不，孩子。你的角色没有真正死亡。他……呃……不过是去了一个更好的地方而已。"
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
-msgstr ""
+msgstr "我猜这进行得并不顺利。"
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "被消灭了。"
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:120
 msgid "You're not dead yet. You're just resting."
 msgstr "你还没死，你只是在休息"
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:132
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You're pining for the fjords."
 msgstr ""
 "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
 "\"false\"用来禁止物品共享。"
 
-#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:428
+#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
+#: src/net/ea/playerhandler.cpp:427
 msgid "Message"
 msgstr "讯息"
 
-#: src/net/ea/playerhandler.cpp:337
+#: src/net/ea/playerhandler.cpp:336
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）"
 
-#: src/net/ea/playerhandler.cpp:347
+#: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:454
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr "你捡起了%s"
 
-#: src/net/ea/playerhandler.cpp:460
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr "你花费 %s."
 
-#: src/net/ea/playerhandler.cpp:506
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr "不能提升技能!"
 
-#: src/net/ea/playerhandler.cpp:624
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr "请先装备弓箭。"
 
-#: src/net/ea/specialhandler.cpp:146
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr "交易失败！"
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr "发送表情失败！"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr "原地休息失败！"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr "聊天创建失败！"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr "不能加入工会！"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr "无法呼喊！"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级！"
 
-#: src/net/ea/specialhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "没有备忘录"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "你无法办到！"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币…… ;-)"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能！"
 
-#: src/net/ea/specialhandler.cpp:197
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石！"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石！"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到！"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr "啊？那是什么？"
 
-#: src/net/ea/specialhandler.cpp:217
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr "传送失败..."
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是否接受？"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "交易不可能进行。与交易伙伴太过太过遥远"
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "交易不可能进行。角色不存在。"
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trade cancelled due to an unknown reason."
 msgstr "交易取消因不明原因。"
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:141
 #, c-format
 msgid "Trade: You and %s"
 msgstr "交易：您和%s"
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:151
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "与%s的交易被取消。"
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:164
 msgid "Unhandled trade cancel packet."
 msgstr "未处理的交易取消分组。"
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:229
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "添加项目失败。交易伙伴已经负重太多。"
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:234
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:239
 msgid "Failed adding item. You can't trade this item."
 msgstr "添加物品失败。您不能交易这项物品."
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:243
 msgid "Failed adding item for unknown reason."
 msgstr "添加项目失败，原因未知。"
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "交易取消。"
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "交易完成。"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
 msgid "Strength"
 msgstr "力量"
 
@@ -5096,7 +5124,7 @@ msgstr "力量"
 msgid "Strength %+.1f"
 msgstr "力量%+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
 msgid "Agility"
 msgstr "敏捷"
 
@@ -5105,7 +5133,7 @@ msgstr "敏捷"
 msgid "Agility %+.1f"
 msgstr "敏捷 %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
 msgid "Dexterity"
 msgstr "敏捷"
 
@@ -5114,7 +5142,7 @@ msgstr "敏捷"
 msgid "Dexterity %+.1f"
 msgstr "灵巧%+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
 msgid "Vitality"
 msgstr "生命"
 
@@ -5123,7 +5151,7 @@ msgstr "生命"
 msgid "Vitality %+.1f"
 msgstr "活力%+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
 msgid "Intelligence"
 msgstr "智慧"
 
@@ -5431,86 +5459,86 @@ msgstr "身份验证失败。"
 msgid "No servers available."
 msgstr "没有可用的服务器。"
 
-#: src/net/tmwa/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "别人尝试使用该帐户。"
 
-#: src/net/tmwa/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr "此帐户已登录。"
 
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr "检测速度劈。"
 
-#: src/net/tmwa/generalhandler.cpp:155
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr "重复登录。"
 
-#: src/net/tmwa/generalhandler.cpp:158
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr "未知的连接错误。"
 
-#: src/net/tmwa/generalhandler.cpp:231
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "Luck"
 msgstr "幸运"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Defense"
-msgstr "国防"
+msgstr "防御"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:274
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:276
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:278
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:279
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
-#: src/net/tmwa/generalhandler.cpp:277
+#: src/net/tmwa/generalhandler.cpp:281
 msgid "Walk Delay"
 msgstr "步行延迟"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:283
 msgid "Attack Range"
 msgstr "攻击范围"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:285
 msgid "Damage per sec."
-msgstr ""
+msgstr "每秒伤害"
 
 #: src/net/tmwa/network.cpp:152
 msgid "Empty address given to Network::connect()!"
 msgstr "空的地址给网络：连接（）！"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:355
 msgid "Unable to resolve host \""
 msgstr "无法解析主机“"
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:425
 msgid "Connection to server terminated. "
 msgstr "连接到服务器终止。"
 
@@ -5519,19 +5547,19 @@ msgstr "连接到服务器终止。"
 msgid "%s is not in your party!"
 msgstr "%s不在你的帮会中！"
 
-#: src/playerrelations.cpp:432
+#: src/playerrelations.cpp:435
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:452
+#: src/playerrelations.cpp:455
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:502
 msgid "Floating bubble"
 msgstr "流动的泡沫"
 
@@ -5548,7 +5576,7 @@ msgstr "攻击 %+d"
 #: src/resources/itemdb.cpp:64
 #, c-format
 msgid "Defense %+d"
-msgstr "防护 %+d"
+msgstr "防御 %+d"
 
 #: src/resources/itemdb.cpp:65
 #, c-format