Update and rebuild translations. Enabled chinese language.

1 files changed, 557 insertions, 552 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dd1c670d4..e2b281bb8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:47+0000\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,108 +20,108 @@ msgstr ""
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
-msgstr ""
+msgstr "在地图上可见"
 
 #: src/being.cpp:542
 msgid "dodge"
-msgstr ""
+msgstr "躲闪"
 
 #: src/being.cpp:542
 msgid "miss"
-msgstr ""
+msgstr "小姐"
 
 #. TRANSLATORS: this away status writed in player nick
 #: src/being.cpp:1514
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
 #: src/being.cpp:1519
 msgid "I"
-msgstr ""
+msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
-msgstr ""
+msgstr "连接到服务器"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "登录"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "请求字符"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "申请登记的详细信息"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "密码成功！"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
-msgstr ""
+msgstr "电子邮件变更"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
-msgstr ""
+msgstr "电子邮件已变更成功！"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
-msgstr ""
+msgstr "注销成功"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "永别了，任何时候回来... ..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -134,154 +134,154 @@ msgstr "未知命令。"
 msgid "Cannot send empty whispers!"
 msgstr "无法发送空白密语！"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "公会名称是缺少的。"
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "请指定一个名称。"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "<回车>键现在切换聊天。"
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
-msgstr ""
+msgstr "朋友"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "无视"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "是不能忽视的！"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽略！"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
-msgstr ""
+msgstr "玩家不能被忽略!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
-msgstr ""
+msgstr "玩家已经被删除!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
-msgstr ""
+msgstr "创建于："
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
-msgstr ""
+msgstr "删除："
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -296,60 +296,60 @@ msgstr "常规"
 
 #: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
-msgstr ""
+msgstr "调试 "
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
-msgstr ""
+msgstr "团队:%s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
-msgstr ""
+msgstr "工会:%s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
-msgstr ""
+msgstr "Pvp等级: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
-msgstr ""
+msgstr "评论: %s"
 
 #: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
@@ -359,19 +359,19 @@ msgstr "机器人检查"
 msgid "Name"
 msgstr "姓名"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "攻击"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "说话"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "移动"
 
@@ -384,8 +384,8 @@ msgid "Reset"
 msgstr "重置"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "购买"
 
@@ -399,7 +399,7 @@ msgstr "价格：%s / 总价：%s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -407,20 +407,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "退出"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "最大"
 
@@ -429,8 +429,8 @@ msgstr "最大"
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -439,19 +439,19 @@ msgstr "出售"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "取消"
 
@@ -503,16 +503,16 @@ msgstr "先输入旧密码。"
 #: src/gui/changepassworddialog.cpp:120
 #, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr ""
+msgstr "新密码需要至少%d个字符长。"
 
 #: src/gui/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr ""
+msgstr "新密码必须小于%d个字符长。"
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "新的密码输入不匹配。"
 
 #: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
@@ -594,7 +594,7 @@ msgstr "帐号和角色管理"
 
 #: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
-msgstr "q登录"
+msgstr "登录"
 
 #: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
@@ -603,21 +603,21 @@ msgstr "注销"
 
 #: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr ""
+msgstr "变更电子邮件"
 
 #: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
-msgstr ""
+msgstr "不正确的密码"
 
 #: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
-msgstr ""
+msgstr "删除字符输入的密码"
 
 #: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
-msgstr ""
+msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -630,11 +630,11 @@ msgstr "选择"
 #: src/gui/charselectdialog.cpp:470
 #, c-format
 msgid "Level %d"
-msgstr ""
+msgstr "等级 %d"
 
 #: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
-msgstr ""
+msgstr "()"
 
 #: src/gui/chatwindow.cpp:112
 msgid "default"
@@ -704,12 +704,12 @@ msgstr "？？？"
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -722,10 +722,10 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "忽略"
 
@@ -779,12 +779,12 @@ msgstr "地图演员数："
 #: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
 msgid "%d FPS (Software)"
-msgstr ""
+msgstr "%d FPS (软件)"
 
 #: src/gui/debugwindow.cpp:166
 #, c-format
 msgid "%d FPS (fast OpenGL)"
-msgstr ""
+msgstr "%d的FPS (快速 OpenGL)"
 
 #: src/gui/debugwindow.cpp:169
 #, c-format
@@ -823,17 +823,17 @@ msgstr "目标水平："
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
 #: src/gui/debugwindow.cpp:346
 msgid "Target Party:"
-msgstr ""
+msgstr "目标："
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
 msgid "Target Guild:"
-msgstr ""
+msgstr "目标公会："
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
 msgid "Attack delay:"
-msgstr ""
+msgstr "攻击延迟："
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
@@ -858,7 +858,7 @@ msgstr ""
 #: src/gui/debugwindow.cpp:393
 #, c-format
 msgid "In: %d bytes/s"
-msgstr ""
+msgstr "输入:%d 字节/"
 
 #: src/gui/debugwindow.cpp:395
 #, c-format
@@ -867,28 +867,28 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "关闭"
 
 #: src/gui/didyouknowwindow.cpp:62
 msgid "< Previous"
-msgstr ""
+msgstr "<上一页"
 
 #: src/gui/didyouknowwindow.cpp:63
 msgid "Next >"
-msgstr ""
+msgstr "下一页>"
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
-msgstr ""
+msgstr "自动打开这个窗口"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "确定"
 
@@ -898,8 +898,8 @@ msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -918,7 +918,7 @@ msgstr "槽："
 
 #: src/gui/inventorywindow.cpp:115
 msgid "Filter:"
-msgstr ""
+msgstr "过滤器："
 
 #: src/gui/inventorywindow.cpp:116
 msgid "Sort:"
@@ -937,50 +937,50 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "装备"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "分离"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
-msgstr ""
+msgstr "装具"
 
 #: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "重量："
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丢弃"
@@ -1023,7 +1023,7 @@ msgstr "未知。"
 
 #: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
-msgstr ""
+msgstr ","
 
 #: src/gui/itempopup.cpp:192
 #, c-format
@@ -1036,7 +1036,7 @@ msgstr "杀敌统计"
 
 #: src/gui/killstats.cpp:64
 msgid "Reset stats"
-msgstr ""
+msgstr "复位统计"
 
 #: src/gui/killstats.cpp:65
 msgid "Reset timer"
@@ -1045,7 +1045,7 @@ msgstr "复位定时器"
 #: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "等级:%d 在 %f%%"
 
 #: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
@@ -1092,7 +1092,7 @@ msgstr[0] ""
 
 #: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
-msgstr ""
+msgstr "最后EXP："
 
 #: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
 #: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
@@ -1110,7 +1110,7 @@ msgstr ""
 #: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
-msgstr ""
+msgstr "%s %d?"
 
 #: src/gui/killstats.cpp:367
 msgid "jacko spawning"
@@ -1132,7 +1132,7 @@ msgstr "跳过"
 msgid "Login"
 msgstr "登录"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "服务器："
@@ -1157,43 +1157,43 @@ msgstr "注册"
 msgid "Change Server"
 msgstr "更改服务器"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
-msgstr ""
+msgstr "法力栏"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
-msgstr ""
+msgstr "重量栏"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
-msgstr ""
+msgstr "钱栏"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
-msgstr ""
+msgstr "状态栏"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "需要"
 
@@ -1214,7 +1214,7 @@ msgstr "提交"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "清除"
 
@@ -1252,327 +1252,328 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "密语"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
-msgstr ""
+msgstr "愈合"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
-msgstr ""
+msgstr "是朋友"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "完全忽略"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
-msgstr ""
+msgstr "按照"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
-msgstr ""
+msgstr "踢从党"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
-msgstr ""
+msgstr "踢从公会"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
-msgstr ""
+msgstr "踢球员"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
-msgstr ""
+msgstr "显示项目"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
-msgstr ""
+msgstr "发表评论"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
-msgstr ""
+msgstr "购买(?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
-msgstr ""
+msgstr "出售(?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
-msgstr ""
+msgstr "优先攻击列表"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
-msgstr ""
+msgstr "加入攻击清单"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
-msgstr ""
+msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "加入聊天"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "地图项"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
-msgstr ""
+msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "法术"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "禁用"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "启用突出"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
-msgstr ""
+msgstr "启用远"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "留下"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "重命名的地图标志"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "名称："
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
-msgstr ""
+msgstr "玩家评论"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
-msgstr ""
+msgstr "评论："
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
-msgstr ""
+msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
-msgstr ""
+msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
-msgstr "找回一半"
+msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
-msgstr ""
+msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
-msgstr ""
+msgstr "显示"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
-msgstr ""
+msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
-msgstr ""
+msgstr "x"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "保存状态"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "交换服务器"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "交换角色"
 
@@ -1608,67 +1609,67 @@ msgstr "密码不能少于%d个字符。"
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr ""
+msgstr "选择你的服务器***安全模式***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "端口："
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
-msgstr ""
+msgstr "游戏分服务器使用相同的IP"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "服务器类型："
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "负载"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "连接"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "自定义服务器"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "请输入服务器的IP地址和端口"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "准备下载"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "错误retreiving的服务器列表！"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
-msgstr ""
+msgstr "需要 v%s"
 
 #: src/gui/setup_audio.cpp:50
 msgid "Enable Audio"
@@ -1708,7 +1709,7 @@ msgstr "音乐声量"
 
 #: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr ""
+msgstr "公告"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
@@ -1724,23 +1725,23 @@ msgstr "颜色"
 
 #: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
-msgstr ""
+msgstr "从收到的聊天消息中删除颜色"
 
 #: src/gui/setup_chat.cpp:60
 msgid "Show chat colors list"
-msgstr ""
+msgstr "显示聊天颜色列表"
 
 #: src/gui/setup_chat.cpp:64
 msgid "Commands"
-msgstr ""
+msgstr "命令"
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
+msgstr "允许在所有聊天标签中使用魔法和GM命令"
 
 #: src/gui/setup_chat.cpp:70
 msgid "Limits"
-msgstr ""
+msgstr "限制"
 
 #: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
@@ -1748,11 +1749,11 @@ msgstr ""
 
 #: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
-msgstr ""
+msgstr "限制聊天的最大"
 
 #: src/gui/setup_chat.cpp:79
 msgid "Logs"
-msgstr ""
+msgstr "日志"
 
 #: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
@@ -1760,19 +1761,19 @@ msgstr "启用聊天记录"
 
 #: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
-msgstr ""
+msgstr "显示聊天记录"
 
 #: src/gui/setup_chat.cpp:88
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
-msgstr ""
+msgstr "隐藏商店的消息"
 
 #: src/gui/setup_chat.cpp:94
 msgid "Tabs"
-msgstr ""
+msgstr "标签"
 
 #: src/gui/setup_chat.cpp:96
 msgid "Put all whispers in tabs"
@@ -1804,11 +1805,11 @@ msgstr ""
 
 #: src/gui/setup_chat.cpp:118
 msgid "Time"
-msgstr ""
+msgstr "时间"
 
 #: src/gui/setup_chat.cpp:120
 msgid "Use local time"
-msgstr ""
+msgstr "使用本地时间"
 
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
@@ -1816,7 +1817,7 @@ msgstr "这就是该色彩看起来的样子"
 
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr ""
+msgstr "类型:"
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1855,19 +1856,19 @@ msgstr "蓝色："
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
-msgstr ""
+msgstr "阿尔法："
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "重置窗口"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
 msgid "Edit"
-msgstr ""
+msgstr "编辑"
 
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
@@ -1915,7 +1916,7 @@ msgstr "检测到按键冲突。"
 
 #: src/gui/setup_other.cpp:40
 msgid "Misc"
-msgstr ""
+msgstr "杂项"
 
 #: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
 msgid "Monsters"
@@ -1927,7 +1928,7 @@ msgstr "显示损坏造成的，以怪物"
 
 #: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "自动目标只有到达怪物"
 
 #: src/gui/setup_other.cpp:54
 msgid "Highlight monster attack range"
@@ -1971,7 +1972,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:89
 msgid "Moving"
-msgstr ""
+msgstr "移动"
 
 #: src/gui/setup_other.cpp:91
 msgid "Auto fix position"
@@ -1979,7 +1980,7 @@ msgstr "自动修复的位置"
 
 #: src/gui/setup_other.cpp:94
 msgid "Attack while moving"
-msgstr ""
+msgstr "攻击的同时移动"
 
 #: src/gui/setup_other.cpp:97
 msgid "Sync player move"
@@ -2007,11 +2008,11 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:115
 msgid "Show job exp messages"
-msgstr ""
+msgstr "显示工作EXP消息"
 
 #: src/gui/setup_other.cpp:118
 msgid "Show players popups"
-msgstr ""
+msgstr "显示球员弹出窗口"
 
 #: src/gui/setup_other.cpp:121
 msgid "Afk message"
@@ -2023,7 +2024,7 @@ msgstr "显示工作"
 
 #: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
-msgstr ""
+msgstr "启用攻击过滤器"
 
 #: src/gui/setup_other.cpp:130
 msgid "Enable advert protocol"
@@ -2035,7 +2036,7 @@ msgstr "接受出售/购买请求"
 
 #: src/gui/setup_other.cpp:139
 msgid "Enable shop mode"
-msgstr ""
+msgstr "启用店模式"
 
 #: src/gui/setup_other.cpp:145
 msgid "Log NPC dialogue"
@@ -2043,11 +2044,11 @@ msgstr "NPC对话"
 
 #: src/gui/setup_other.cpp:149
 msgid "Other"
-msgstr ""
+msgstr "其他"
 
 #: src/gui/setup_other.cpp:151
 msgid "Enable server side attack"
-msgstr ""
+msgstr "启用服务器端的攻击"
 
 #: src/gui/setup_other.cpp:154
 msgid "Enable bot checker"
@@ -2055,7 +2056,7 @@ msgstr "启用BOT检查"
 
 #: src/gui/setup_other.cpp:157
 msgid "Enable buggy servers protection"
-msgstr ""
+msgstr "启用BUG保护"
 
 #: src/gui/setup_other.cpp:160
 msgid "Enable debug log"
@@ -2071,11 +2072,11 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:169
 msgid "Show background"
-msgstr ""
+msgstr "显示背景"
 
 #: src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
-msgstr ""
+msgstr "Perfomance"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
@@ -2083,7 +2084,7 @@ msgstr ""
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "自动调整"
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Show beings transparency"
@@ -2131,7 +2132,7 @@ msgstr "玩家"
 
 #: src/gui/setup_players.cpp:54
 msgid "Show gender"
-msgstr ""
+msgstr "显示性别"
 
 #: src/gui/setup_players.cpp:57
 msgid "Show level"
@@ -2159,6 +2160,10 @@ msgstr ""
 
 #: src/gui/setup_players.cpp:75
 msgid "Show statuses"
+msgstr "显示状态"
+
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #: src/gui/setup_relations.cpp:65
@@ -2195,11 +2200,11 @@ msgstr "允许密语"
 
 #: src/gui/setup_relations.cpp:244
 msgid "Old"
-msgstr ""
+msgstr "旧"
 
 #: src/gui/setup_relations.cpp:246
 msgid "Relations"
-msgstr ""
+msgstr "关系"
 
 #: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
@@ -2346,7 +2351,7 @@ msgstr "作为发射武器"
 
 #: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr ""
+msgstr "FPS限制："
 
 #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
 #: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
@@ -2371,18 +2376,18 @@ msgstr "环境音效"
 
 #: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr ""
+msgstr "l"
 
 #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
 #: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr ""
+msgstr "w"
 
 #: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
+msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
 
 #: src/gui/setup_video.cpp:490
 msgid ""
@@ -2391,7 +2396,7 @@ msgstr ""
 
 #: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr ""
+msgstr "切换到全屏"
 
 #: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
@@ -2399,7 +2404,7 @@ msgstr "重启生效"
 
 #: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr ""
+msgstr "切换到OpenGL"
 
 #: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
@@ -2415,7 +2420,7 @@ msgstr "输入新的分辨率:"
 
 #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr ""
+msgstr "屏幕分辨率已更改"
 
 #: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
@@ -2423,7 +2428,7 @@ msgstr ""
 
 #: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr ""
+msgstr "粒子效果更改的设置。"
 
 #: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
@@ -2431,7 +2436,7 @@ msgstr "变更会在地图更换时生效。"
 
 #: src/gui/shopwindow.cpp:74
 msgid "Personal Shop"
-msgstr ""
+msgstr "个人商店"
 
 #: src/gui/shopwindow.cpp:116
 msgid "Buy items"
@@ -2448,11 +2453,11 @@ msgstr "添加"
 
 #: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
 msgid "Announce"
-msgstr ""
+msgstr "公布"
 
 #: src/gui/shopwindow.cpp:125
 msgid "Show links in announce"
-msgstr ""
+msgstr "显示在公布的联系"
 
 #: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
 #: src/net/manaserv/tradehandler.cpp:127
@@ -2462,7 +2467,7 @@ msgstr "请求交易"
 #: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%s想要%s %s 你接受吗？"
 
 #: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2518,7 +2523,7 @@ msgstr "会员邀请到公会"
 #: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "你要邀请谁加入工会%s?"
 
 #: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
@@ -2527,11 +2532,11 @@ msgstr "离开公会？"
 #: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr ""
+msgstr "你确定要离开工会%s吗？"
 
 #: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
-msgstr "帮会"
+msgstr "t"
 
 #: src/gui/socialwindow.cpp:243
 #, c-format
@@ -2554,7 +2559,7 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
-msgstr ""
+msgstr "离开团队?"
 
 #: src/gui/socialwindow.cpp:295
 #, c-format
@@ -2575,7 +2580,7 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:872
 msgid "Attack mobs"
-msgstr ""
+msgstr "攻击暴徒"
 
 #: src/gui/socialwindow.cpp:907
 msgid "Ignore mobs"
@@ -2587,7 +2592,7 @@ msgstr "创建帮会"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "建立党"
+msgstr "建立"
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
@@ -2753,7 +2758,7 @@ msgstr ""
 
 #: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr ""
+msgstr "(?)移动到目标"
 
 #: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
@@ -2789,11 +2794,11 @@ msgstr ""
 
 #: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr ""
+msgstr "(?) 攻击"
 
 #: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
-msgstr ""
+msgstr "(G) 去攻击"
 
 #: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
@@ -2833,7 +2838,7 @@ msgstr ""
 
 #: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
-msgstr ""
+msgstr "(?)拿起"
 
 #: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
@@ -2931,180 +2936,180 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP："
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "经验："
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP："
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "职业："
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "角色可用点: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
-msgstr ""
+msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
-msgstr ""
+msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
-msgstr ""
+msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
-msgstr ""
+msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgstr "(d)"
+
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
-msgstr ""
+msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
-msgstr ""
+msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
-msgstr ""
+msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
-msgstr ""
+msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
-msgstr ""
+msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
-msgstr ""
+msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
-msgstr ""
+msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
-msgstr ""
+msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
-msgstr ""
+msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
-msgstr ""
+msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
-msgstr ""
+msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
-msgstr ""
+msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
-msgstr ""
+msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
-msgstr ""
+msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
-msgstr ""
+msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
-msgstr ""
+msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
-msgstr ""
+msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
-msgstr ""
+msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
-msgstr ""
+msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
-msgstr ""
+msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
-msgstr ""
+msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
-msgstr ""
+msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
-msgstr ""
+msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
-msgstr ""
+msgstr "(O)"
 
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
@@ -3128,15 +3133,15 @@ msgstr "生活魔术"
 
 #: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr ""
+msgstr "战魔"
 
 #: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
-msgstr ""
+msgstr "蜕变魔术"
 
 #: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
-msgstr ""
+msgstr "大自然的神奇"
 
 #: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
@@ -3237,33 +3242,33 @@ msgstr "你没有足够的钱币."
 msgid "Name: %s"
 msgstr "姓名：%s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "更新..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "已完成"
 
@@ -3277,7 +3282,7 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
-msgstr ""
+msgstr "豁免计算名称"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
@@ -3313,7 +3318,7 @@ msgstr "怪物的HP指示栏(第二个颜色)"
 
 #: src/gui/userpalette.cpp:129
 msgid "Party Members"
-msgstr ""
+msgstr "党的议员"
 
 #: src/gui/userpalette.cpp:130
 msgid "Guild Members"
@@ -3401,7 +3406,7 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:163
 msgid "Monster Attack Range"
-msgstr ""
+msgstr "怪物攻击范围"
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3433,11 +3438,11 @@ msgstr "谁在线 - 错误"
 
 #: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
-msgstr ""
+msgstr "谁在线 - 更新"
 
 #: src/gui/widgets/battletab.cpp:45
 msgid "Battle"
-msgstr ""
+msgstr "战斗"
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
@@ -3577,7 +3582,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
-msgstr ""
+msgstr "机器人检查"
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3585,7 +3590,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "Who is online"
-msgstr ""
+msgstr "谁在线"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
@@ -3593,7 +3598,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:71
 msgid "Smilies"
-msgstr ""
+msgstr "表情符号"
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3820,7 +3825,7 @@ msgstr "Debug窗口"
 
 #: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr ""
+msgstr "社会窗口"
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
@@ -3840,7 +3845,7 @@ msgstr "快速下拉窗口"
 
 #: src/keyboardconfig.cpp:152
 msgid "Kill Stats Window"
-msgstr ""
+msgstr "杀敌统计窗口"
 
 #: src/keyboardconfig.cpp:154
 msgid "Commands Window"
@@ -3852,7 +3857,7 @@ msgstr "BOT检查窗口"
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
-msgstr ""
+msgstr "谁是在线窗口"
 
 #: src/keyboardconfig.cpp:161
 msgid "Did you know Window"
@@ -3860,7 +3865,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:164
 msgid "Previous Social Tab"
-msgstr ""
+msgstr "上一页社会标签"
 
 #: src/keyboardconfig.cpp:166
 msgid "Next Social Tab"
@@ -3927,7 +3932,7 @@ msgstr "下一个聊天窗口标签页"
 
 #: src/keyboardconfig.cpp:278
 msgid "Close current Chat Tab"
-msgstr ""
+msgstr "关闭当前聊天标签"
 
 #: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
@@ -4003,7 +4008,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
-msgstr ""
+msgstr "使用魔法攻击"
 
 #: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
@@ -4039,7 +4044,7 @@ msgstr "开/关 音频"
 
 #: src/keyboardconfig.cpp:333
 msgid "Enable / Disable away mode"
-msgstr ""
+msgstr "启用/禁用离开模式"
 
 #: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
@@ -4070,11 +4075,11 @@ msgstr ""
 
 #: src/localplayer.cpp:1404
 msgid "Item is too heavy."
-msgstr ""
+msgstr "项目是太重了。"
 
 #: src/localplayer.cpp:1406
 msgid "Item is too far away."
-msgstr ""
+msgstr "物品太远了。"
 
 #: src/localplayer.cpp:1408
 msgid "Inventory is full."
@@ -4098,15 +4103,15 @@ msgstr ""
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
+msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
 #: src/localplayer.cpp:3174
 msgid "Away"
-msgstr ""
+msgstr "距离"
 
 #: src/localplayer.cpp:3478
 msgid "Follow: "
-msgstr ""
+msgstr "跟随:"
 
 #: src/localplayer.cpp:3480 src/localplayer.cpp:3495
 msgid "Follow canceled"
@@ -4126,15 +4131,15 @@ msgstr "你看"
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
-msgstr ""
+msgstr "manaplus [选项] [mana-file]"
 
 #: src/main.cpp:48
 msgid "[mana-file] : The mana file is an XML file (.mana)"
-msgstr ""
+msgstr "[mana-file] : The mana is an XML file (.mana)"
 
 #: src/main.cpp:49
 msgid "              used to set custom parameters"
-msgstr ""
+msgstr "用于设置自定义参数"
 
 #: src/main.cpp:50
 msgid "              to the manaplus client."
@@ -4146,7 +4151,7 @@ msgstr "选项："
 
 #: src/main.cpp:53
 msgid "  -l --log-file       : Log file to use"
-msgstr ""
+msgstr "-l--log-file 日志文件"
 
 #: src/main.cpp:54
 msgid "  -L --chat-log-dir   : Chat log dir to use"
@@ -4154,7 +4159,7 @@ msgstr ""
 
 #: src/main.cpp:55
 msgid "  -v --version        : Display the version"
-msgstr ""
+msgstr "-v --version: 显示版本"
 
 #: src/main.cpp:56
 msgid "  -h --help           : Display this help"
@@ -4254,7 +4259,7 @@ msgstr "幸运："
 
 #: src/net/ea/charserverhandler.cpp:102
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
+msgstr "访问被拒绝。最有可能的，也有太多的球员，在此服务器上。"
 
 #: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
@@ -4270,15 +4275,15 @@ msgstr "创建角色失败。很可能名称已被占用。"
 
 #: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
 msgid "Wrong name."
-msgstr ""
+msgstr "错误的名称。"
 
 #: src/net/ea/charserverhandler.cpp:145
 msgid "Incorrect stats."
-msgstr ""
+msgstr "不正确的统计。"
 
 #: src/net/ea/charserverhandler.cpp:148
 msgid "Incorrect hair."
-msgstr ""
+msgstr "不正确的头发。"
 
 #: src/net/ea/charserverhandler.cpp:151
 msgid "Incorrect slot."
@@ -4306,7 +4311,7 @@ msgstr "聊天频道不被支持！"
 #: src/net/ea/chathandler.cpp:128
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr ""
+msgstr "密语无法发送，%s离线。"
 
 #: src/net/ea/chathandler.cpp:136
 #, c-format
@@ -4315,20 +4320,20 @@ msgstr ""
 
 #: src/net/ea/chathandler.cpp:348
 msgid "MVP player."
-msgstr ""
+msgstr "MVP球员。"
 
 #: src/net/ea/chathandler.cpp:352
 msgid "MVP player: "
-msgstr ""
+msgstr "MVP球员："
 
 #: src/net/ea/gamehandler.cpp:86
 #, c-format
 msgid "Online users: %d"
-msgstr ""
+msgstr "在线用户数：%d"
 
 #: src/net/ea/gamehandler.cpp:98
 msgid "Game"
-msgstr ""
+msgstr "游戏"
 
 #: src/net/ea/gamehandler.cpp:98
 msgid "Request to quit denied!"
@@ -4356,15 +4361,15 @@ msgstr "/help > 显示该帮助信息。"
 
 #: src/net/ea/gui/guildtab.cpp:136
 msgid "/invite > Invite a player to your guild"
-msgstr ""
+msgstr "/invite > "
 
 #: src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr ""
+msgstr "/leave > "
 
 #: src/net/ea/gui/guildtab.cpp:138
 msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
+msgstr "/kick >"
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
@@ -4372,7 +4377,7 @@ msgstr "帮会已创建"
 
 #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr ""
+msgstr "您已经在公会。"
 
 #: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
@@ -4380,7 +4385,7 @@ msgstr ""
 
 #: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr ""
+msgstr "未知的服务器的响应。"
 
 #: src/net/ea/guildhandler.cpp:180
 #, c-format
@@ -4390,37 +4395,37 @@ msgstr ""
 #: src/net/ea/guildhandler.cpp:182
 #, c-format
 msgid "Guild master: %s"
-msgstr ""
+msgstr "工会会长: %s"
 
 #: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
-msgstr ""
+msgstr "工会等级: %d"
 
 #: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
-msgstr ""
+msgstr "在线玩家: %d"
 
 #: src/net/ea/guildhandler.cpp:188
 #, c-format
 msgid "Max members: %d"
-msgstr ""
+msgstr "最大成员: %d"
 
 #: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Average level: %d"
-msgstr ""
+msgstr "平均等级: %d"
 
 #: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild exp: %d"
-msgstr ""
+msgstr "工会经验值: %d"
 
 #: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild next exp: %d"
-msgstr ""
+msgstr "工会下一级所需经验: %d"
 
 #: src/net/ea/guildhandler.cpp:196
 #, c-format
@@ -4437,7 +4442,7 @@ msgstr ""
 
 #: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
-msgstr ""
+msgstr "用户现在是你们的工会成员了."
 
 #: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
@@ -4445,25 +4450,25 @@ msgstr ""
 
 #: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
-msgstr ""
+msgstr "未知工会邀请响应."
 
 #: src/net/ea/guildhandler.cpp:438
 msgid "You have left the guild."
-msgstr ""
+msgstr "你已经离开工会."
 
 #: src/net/ea/guildhandler.cpp:452
 #, c-format
 msgid "%s has left your guild."
-msgstr ""
+msgstr "%s已经离开工会."
 
 #: src/net/ea/guildhandler.cpp:483
 msgid "You was kicked from guild."
-msgstr ""
+msgstr "你已经被工会开除！."
 
 #: src/net/ea/guildhandler.cpp:496
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr ""
+msgstr "%s已经被工会开除."
 
 #: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
@@ -4505,7 +4510,7 @@ msgstr "改命令改变帮会的物品共享策略。"
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
+msgstr "<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4587,7 +4592,7 @@ msgstr "旧密码不正确。"
 
 #: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr ""
+msgstr "新密码太短。"
 
 #: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
@@ -4598,15 +4603,15 @@ msgstr "未知的错误。"
 
 #: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr ""
+msgstr "未注册的ID。"
 
 #: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr ""
+msgstr "错误的密码。"
 
 #: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr ""
+msgstr "账户过期失效。"
 
 #: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
@@ -4615,11 +4620,11 @@ msgstr ""
 #: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
+msgstr "您已被永久禁止进入游戏。请联系GM团队。"
 
 #: src/net/ea/loginhandler.cpp:221
 msgid "Client too old."
-msgstr ""
+msgstr "客户端太旧。"
 
 #: src/net/ea/loginhandler.cpp:224
 #, c-format
@@ -4653,7 +4658,7 @@ msgstr "帮会创建成功。"
 #: src/net/ea/partyhandler.cpp:140
 #, c-format
 msgid "%s has joined your party."
-msgstr ""
+msgstr "%s已经加入你的党。"
 
 #: src/net/ea/partyhandler.cpp:176
 #, c-format
@@ -4673,7 +4678,7 @@ msgstr "%s现在是你帮会中的成员了。"
 #: src/net/ea/partyhandler.cpp:191
 #, c-format
 msgid "%s can't join your party because party is full."
-msgstr ""
+msgstr "%s不能加入团队，因为团队成员已满。"
 
 #: src/net/ea/partyhandler.cpp:196
 #, c-format
@@ -4827,16 +4832,16 @@ msgstr ""
 #: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
-msgstr ""
+msgstr "你捡起了%s"
 
 #: src/net/ea/playerhandler.cpp:457
 #, c-format
 msgid "You spent %s."
-msgstr ""
+msgstr "你花费 %s."
 
 #: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
-msgstr ""
+msgstr "不能提升技能!"
 
 #: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
@@ -4963,7 +4968,7 @@ msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
 
 #: src/net/ea/tradehandler.cpp:241
 msgid "Failed adding item. You can't trade this item."
-msgstr ""
+msgstr "添加物品失败。您不能交易这项物品."
 
 #: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
@@ -5090,12 +5095,12 @@ msgstr "删除。"
 
 #: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr ""
+msgstr "范围。"
 
 #: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
-msgstr ""
+msgstr "未知错误(%d)"
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
@@ -5109,15 +5114,15 @@ msgstr "主题：%s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr ""
+msgstr "玩家在此通道："
 
 #: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr ""
+msgstr "加入通道时发生错误。"
 
 #: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr ""
+msgstr "上市渠道。"
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
@@ -5339,7 +5344,7 @@ msgstr "重复登录。"
 
 #: src/net/tmwa/generalhandler.cpp:159
 msgid "Unknown connection error."
-msgstr ""
+msgstr "未知的连接错误。"
 
 #: src/net/tmwa/generalhandler.cpp:232
 msgid "Got disconnected from server!"
@@ -5394,7 +5399,7 @@ msgstr "空的地址给网络：连接（）！"
 
 #: src/net/tmwa/network.cpp:356
 msgid "Unable to resolve host \""
-msgstr ""
+msgstr "无法解析主机“"
 
 #: src/net/tmwa/network.cpp:426
 msgid "Connection to server terminated. "
@@ -5419,7 +5424,7 @@ msgstr ""
 
 #: src/playerrelations.cpp:481
 msgid "Floating bubble"
-msgstr ""
+msgstr "流动的泡沫"
 
 #: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
 #: src/resources/monsterdb.cpp:84