From 0b228c1ed05177a761dce44df31f087c0313dc64 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 2 Dec 2012 01:35:05 +0300
Subject: update and rebuild translations.

---
 po/zh_CN.po | 376 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 192 insertions(+), 184 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 08df2eb5f..54cab571d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-11-24 15:21+0300\n"
-"PO-Revision-Date: 2012-11-20 22:36+0000\n"
+"POT-Creation-Date: 2012-12-02 01:31+0300\n"
+"PO-Revision-Date: 2012-12-01 22:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -56,54 +56,54 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1071 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:169
+#: src/client.cpp:1074 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:169
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:1074 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1077 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:1076 src/gui/setup_video.cpp:243
+#: src/client.cpp:1079 src/gui/setup_video.cpp:243
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1081
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1081 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1084 src/gui/didyouknowwindow.cpp:71
 #: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
 #: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:501
 #: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
 msgid "Close"
 msgstr "关闭"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1174
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1216
 msgid "Logging in"
 msgstr "登录中"
 
-#: src/client.cpp:1251
+#: src/client.cpp:1254
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
-#: src/client.cpp:1364
+#: src/client.cpp:1367
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1402
+#: src/client.cpp:1405
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1417
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
-#: src/client.cpp:1470 src/client.cpp:1480 src/client.cpp:1639
+#: src/client.cpp:1473 src/client.cpp:1483 src/client.cpp:1642
 #: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
 #: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -112,248 +112,248 @@ msgstr "正在更改游戏服务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
-#: src/client.cpp:1528
+#: src/client.cpp:1531
 msgid "Password Change"
 msgstr "更改密码"
 
-#: src/client.cpp:1529
+#: src/client.cpp:1532
 msgid "Password changed successfully!"
 msgstr "密码更改成功！"
 
-#: src/client.cpp:1549
+#: src/client.cpp:1552
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
-#: src/client.cpp:1550
+#: src/client.cpp:1553
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功！"
 
-#: src/client.cpp:1570
+#: src/client.cpp:1573
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
-#: src/client.cpp:1571
+#: src/client.cpp:1574
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来... ..."
 
-#: src/client.cpp:1818 src/client.cpp:1832 src/client.cpp:1868
-#: src/client.cpp:1883 src/client.cpp:2343 src/client.cpp:2350
+#: src/client.cpp:1821 src/client.cpp:1835 src/client.cpp:1871
+#: src/client.cpp:1886 src/client.cpp:2346 src/client.cpp:2353
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出。"
 
-#: src/client.cpp:2032
+#: src/client.cpp:2035
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "主机更新无效：%s"
 
-#: src/client.cpp:2071 src/client.cpp:2077
+#: src/client.cpp:2074 src/client.cpp:2080
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:2098 src/client.cpp:2110
+#: src/client.cpp:2101 src/client.cpp:2113
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出。"
 
-#: src/commandhandler.cpp:230
+#: src/commandhandler.cpp:59
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:350
+#: src/commands.cpp:132 src/commands.cpp:402 src/commands.cpp:476
+#: src/commands.cpp:516
+msgid "Please specify a name."
+msgstr "请指定一个名称。"
+
+#: src/commands.cpp:140
+#, c-format
+msgid "Player already %s!"
+msgstr "玩家已经%s!"
+
+#: src/commands.cpp:154
+#, c-format
+msgid "Player successfully %s!"
+msgstr "玩家成功%s!"
+
+#: src/commands.cpp:162
+#, c-format
+msgid "Player could not be %s!"
+msgstr "玩家不能为 %s"
+
+#: src/commands.cpp:330
 msgid "Cannot send empty whispers!"
 msgstr "无法发送空白私信！"
 
-#: src/commandhandler.cpp:364
+#: src/commands.cpp:344
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "无法为 \"%s\"创建私信标签！要么已经存在，要么是你自己。"
 
-#: src/commandhandler.cpp:384
+#: src/commands.cpp:363
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:401 src/net/ea/gui/partytab.cpp:124
+#: src/commands.cpp:378 src/net/ea/gui/partytab.cpp:124
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:413
+#: src/commands.cpp:389
 msgid "Guild name is missing."
 msgstr "公会名称缺失。"
 
-#: src/commandhandler.cpp:426 src/commandhandler.cpp:542
-#: src/commandhandler.cpp:584 src/commandhandler.cpp:625
-msgid "Please specify a name."
-msgstr "请指定一个名称。"
-
-#: src/commandhandler.cpp:477
+#: src/commands.cpp:417
 msgid "Return toggles chat."
 msgstr "<回车>键促发聊天。"
 
-#: src/commandhandler.cpp:477
+#: src/commands.cpp:417
 msgid "Message closes chat."
 msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:486
+#: src/commands.cpp:426
 msgid "Return now toggles chat."
 msgstr "<回车>键现在促发聊天。"
 
-#: src/commandhandler.cpp:492
+#: src/commands.cpp:432
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:520
+#: src/commands.cpp:458
 msgid "friend"
 msgstr "朋友"
 
-#: src/commandhandler.cpp:526
+#: src/commands.cpp:463
 msgid "disregarded"
 msgstr "无视"
 
-#: src/commandhandler.cpp:531
+#: src/commands.cpp:468
 msgid "neutral"
 msgstr "中立"
 
-#: src/commandhandler.cpp:550
-#, c-format
-msgid "Player already %s!"
-msgstr "玩家已经%s!"
-
-#: src/commandhandler.cpp:564
-#, c-format
-msgid "Player successfully %s!"
-msgstr "玩家成功%s!"
-
-#: src/commandhandler.cpp:572
-#, c-format
-msgid "Player could not be %s!"
-msgstr "玩家不能为 %s"
-
-#: src/commandhandler.cpp:596
+#: src/commands.cpp:488
 msgid "Player wasn't ignored!"
 msgstr "玩家没有被忽视！"
 
-#: src/commandhandler.cpp:603
+#: src/commands.cpp:495
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽视！"
 
-#: src/commandhandler.cpp:605
+#: src/commands.cpp:497
 msgid "Player could not be unignored!"
 msgstr "不能取消对玩家的忽视!"
 
-#: src/commandhandler.cpp:612
+#: src/commands.cpp:503
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:617
+#: src/commands.cpp:508
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:632
+#: src/commands.cpp:523
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
-#: src/commandhandler.cpp:643
+#: src/commands.cpp:534
 msgid "Player successfully erased!"
 msgstr "玩家成功被删除！"
 
-#: src/commandhandler.cpp:645
+#: src/commands.cpp:536
 msgid "Player could not be erased!"
 msgstr "无法删除玩家！"
 
-#: src/commandhandler.cpp:970 src/commandhandler.cpp:1016
+#: src/commands.cpp:819 src/commands.cpp:865
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:980
+#: src/commands.cpp:829
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:989
+#: src/commands.cpp:838
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:997
+#: src/commands.cpp:846
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1005
+#: src/commands.cpp:854
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1013
+#: src/commands.cpp:862
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1092
+#: src/commands.cpp:936
 msgid "font cache size"
 msgstr "字体缓存大小"
 
-#: src/commandhandler.cpp:1104
+#: src/commands.cpp:948
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1108
+#: src/commands.cpp:952
 msgid "Created:"
 msgstr "创建于："
 
-#: src/commandhandler.cpp:1110
+#: src/commands.cpp:954
 msgid "Deleted:"
 msgstr "删除："
 
-#: src/commandhandler.cpp:1313 src/commandhandler.cpp:1320
+#: src/commands.cpp:1100 src/commands.cpp:1107
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1315 src/commandhandler.cpp:1322
+#: src/commands.cpp:1102 src/commands.cpp:1109
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:34
+#: src/commands.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:258 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:258 src/gui/widgets/chattab.cpp:446
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:262 src/gui/debugwindow.cpp:50 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:263 src/gui/debugwindow.cpp:50 src/gui/widgets/chattab.cpp:448
 #: src/gui/windowmenu.cpp:161
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:539
+#: src/game.cpp:540
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:611
+#: src/game.cpp:612
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:612
+#: src/game.cpp:613
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -458,7 +458,7 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:48
-#: src/gui/inventorywindow.cpp:183 src/gui/setup_other.cpp:148
+#: src/gui/inventorywindow.cpp:183 src/gui/setup_other.cpp:150
 #: src/gui/windowmenu.cpp:155
 msgid "Shop"
 msgstr "商店"
@@ -596,7 +596,7 @@ msgstr "美女"
 #: src/gui/charcreatedialog.cpp:91 src/gui/registerdialog.cpp:104
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:128 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:211 src/gui/setup_visual.cpp:100
+#: src/gui/setup_other.cpp:213 src/gui/setup_visual.cpp:100
 msgid "Other"
 msgstr "其他"
 
@@ -994,12 +994,12 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:54 src/gui/inventorywindow.cpp:184
+#: src/gui/equipmentwindow.cpp:55 src/gui/inventorywindow.cpp:184
 #: src/gui/windowmenu.cpp:113
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:59 src/gui/inventorywindow.cpp:168
+#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
 #: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1667
 #: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1825
 msgid "Unequip"
@@ -1219,7 +1219,7 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:442
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:444
 msgid "You have left the guild."
 msgstr "你已经离开工会."
 
@@ -1333,7 +1333,7 @@ msgid "Submit"
 msgstr "提交"
 
 #: src/gui/npcdialog.cpp:64 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "NPC"
 msgstr "NPC"
 
@@ -1373,7 +1373,7 @@ msgid "Key: %s"
 msgstr "按键：%s"
 
 #: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:542
-#: src/gui/widgets/tradetab.cpp:40
+#: src/gui/widgets/tradetab.cpp:39
 msgid "Trade"
 msgstr "交易"
 
@@ -2345,7 +2345,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:185
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:187
 msgid "Windows"
 msgstr ""
 
@@ -2787,167 +2787,171 @@ msgstr "同步播放移动"
 msgid "Crazy move A program"
 msgstr "疯狂的举动的程序"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
+msgid "Mouse relative moves (good for touch interfaces)"
+msgstr ""
+
+#: src/gui/setup_other.cpp:117
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:119
 msgid "Show own hp bar"
 msgstr "显示自己的HP栏"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:122
 msgid "Enable quick stats"
 msgstr "启用快速统计"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:125
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:128
 msgid "Show job exp messages"
 msgstr "显示工作EXP消息"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:131
 msgid "Show players popups"
 msgstr "显示球员弹出窗口"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:134
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:137
 msgid "Show job"
 msgstr "显示工作"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:140
 msgid "Enable attack filter"
 msgstr "启用攻击过滤器"
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 msgid "Enable pickup filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:146
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:152
 msgid "Accept sell/buy requests"
 msgstr "接受出售/购买请求"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 msgid "Enable shop mode"
 msgstr "启用商店模式"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:161
 msgid "Cycle npc targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:164
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 msgid "Bots support"
 msgstr "挂机支持"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:170
 msgid "Enable auction bot support"
 msgstr "启用拍卖挂机支持"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:173
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:176
+#: src/gui/setup_other.cpp:178
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:190
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:191
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:190
+#: src/gui/setup_other.cpp:192
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:196
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:198
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:197
+#: src/gui/setup_other.cpp:199
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:203
+#: src/gui/setup_other.cpp:205
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:204
+#: src/gui/setup_other.cpp:206
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:207
+#: src/gui/setup_other.cpp:209
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:213
+#: src/gui/setup_other.cpp:215
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_other.cpp:216
+#: src/gui/setup_other.cpp:218
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
-#: src/gui/setup_other.cpp:219
+#: src/gui/setup_other.cpp:221
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:223
+#: src/gui/setup_other.cpp:225
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
-#: src/gui/setup_other.cpp:226
+#: src/gui/setup_other.cpp:228
 msgid "Enable OpenGL log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:231
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
-#: src/gui/setup_other.cpp:232
+#: src/gui/setup_other.cpp:234
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:237
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:240
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:241
+#: src/gui/setup_other.cpp:243
 msgid "Show background"
 msgstr "显示背景"
 
@@ -3594,7 +3598,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "等级: %d（%+d）"
 
 #: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:251
-#: src/gui/widgets/guildchattab.cpp:40 src/net/ea/gui/guildtab.cpp:47
+#: src/gui/widgets/guildchattab.cpp:39 src/net/ea/gui/guildtab.cpp:46
 msgid "Guild"
 msgstr "帮会"
 
@@ -4247,7 +4251,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "该命令使<昵称>成为频道管理员。"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:66
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:65
 #: src/net/ea/gui/partytab.cpp:84
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<昵称>包含空格，请用双引号(\")括起。"
@@ -4286,38 +4290,38 @@ msgstr "%s 全局公告："
 msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:64
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:63
 #: src/net/ea/gui/partytab.cpp:82
 msgid "Command: /invite <nick>"
 msgstr "命令：/invite <昵称>"
 
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:65
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:64
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:71
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:70
 #: src/net/ea/gui/partytab.cpp:89
 msgid "Command: /leave"
 msgstr "命令：/leave"
 
-#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:72
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:71
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:132
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:131
 #: src/net/ea/gui/partytab.cpp:68
 msgid "/help > Display this help."
 msgstr "/help > 显示该帮助信息。"
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:133
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:132
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > "
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:134
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:133
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > "
 
-#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:135
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:134
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick >"
 
@@ -5113,97 +5117,97 @@ msgstr "游戏"
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:80
+#: src/net/ea/guildhandler.cpp:81
 msgid "Guild created."
 msgstr "帮会已创建"
 
-#: src/net/ea/guildhandler.cpp:85 src/net/ea/guildhandler.cpp:90
+#: src/net/ea/guildhandler.cpp:86 src/net/ea/guildhandler.cpp:91
 msgid "You are already in guild."
 msgstr "您已经在公会。"
 
-#: src/net/ea/guildhandler.cpp:95
+#: src/net/ea/guildhandler.cpp:96
 msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:100
+#: src/net/ea/guildhandler.cpp:101
 msgid "Unknown server response."
 msgstr "未知的服务器的响应。"
 
-#: src/net/ea/guildhandler.cpp:177
+#: src/net/ea/guildhandler.cpp:179
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "工会会长: %s"
 
-#: src/net/ea/guildhandler.cpp:181
+#: src/net/ea/guildhandler.cpp:183
 #, c-format
 msgid "Guild level: %d"
 msgstr "工会等级: %d"
 
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Online members: %d"
 msgstr "在线玩家: %d"
 
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Max members: %d"
 msgstr "最大成员: %d"
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
 msgid "Average level: %d"
 msgstr "平均等级: %d"
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild exp: %d"
 msgstr "工会经验值: %d"
 
-#: src/net/ea/guildhandler.cpp:189
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "工会下一级所需经验: %d"
 
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:193
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:403
+#: src/net/ea/guildhandler.cpp:405
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:407
+#: src/net/ea/guildhandler.cpp:409
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:411
+#: src/net/ea/guildhandler.cpp:413
 msgid "User is now part of your guild."
 msgstr "用户现在是你们的工会成员了."
 
-#: src/net/ea/guildhandler.cpp:415
+#: src/net/ea/guildhandler.cpp:417
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:419
+#: src/net/ea/guildhandler.cpp:421
 msgid "Unknown guild invite response."
 msgstr "未知工会邀请响应."
 
-#: src/net/ea/guildhandler.cpp:455
+#: src/net/ea/guildhandler.cpp:457
 #, c-format
 msgid "%s has left your guild."
 msgstr "%s已经离开工会."
 
-#: src/net/ea/guildhandler.cpp:490
+#: src/net/ea/guildhandler.cpp:492
 msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:503
+#: src/net/ea/guildhandler.cpp:505
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s已经被工会开除."
@@ -5284,15 +5288,15 @@ msgstr "命令：/exp"
 msgid "This command displays the party's current experience sharing policy."
 msgstr "该命令显示帮会现有的经验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:147 src/net/ea/partyhandler.cpp:280
+#: src/net/ea/gui/partytab.cpp:147 src/net/ea/partyhandler.cpp:282
 msgid "Item sharing enabled."
 msgstr "物品共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:150 src/net/ea/partyhandler.cpp:290
+#: src/net/ea/gui/partytab.cpp:150 src/net/ea/partyhandler.cpp:292
 msgid "Item sharing disabled."
 msgstr "物品共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:153 src/net/ea/partyhandler.cpp:300
+#: src/net/ea/gui/partytab.cpp:153 src/net/ea/partyhandler.cpp:302
 msgid "Item sharing not possible."
 msgstr "物品共享不可能。"
 
@@ -5300,15 +5304,15 @@ msgstr "物品共享不可能。"
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:186 src/net/ea/partyhandler.cpp:242
+#: src/net/ea/gui/partytab.cpp:186 src/net/ea/partyhandler.cpp:244
 msgid "Experience sharing enabled."
 msgstr "经验共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:189 src/net/ea/partyhandler.cpp:252
+#: src/net/ea/gui/partytab.cpp:189 src/net/ea/partyhandler.cpp:254
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:192 src/net/ea/partyhandler.cpp:262
+#: src/net/ea/gui/partytab.cpp:192 src/net/ea/partyhandler.cpp:264
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能。"
 
@@ -5336,7 +5340,7 @@ msgstr "旧密码不正确。"
 msgid "New password too short."
 msgstr "新密码太短。"
 
-#: src/net/ea/loginhandler.cpp:156 src/net/ea/loginhandler.cpp:268
+#: src/net/ea/loginhandler.cpp:156 src/net/ea/loginhandler.cpp:271
 msgid "Unknown error."
 msgstr "未知的错误。"
 
@@ -5383,6 +5387,10 @@ msgid "This user name is already taken."
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:265
+msgid "Incorrect email."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:268
 msgid "Username permanently erased."
 msgstr ""
 
@@ -5398,54 +5406,54 @@ msgstr "无法解析主机“"
 msgid "Connection to server terminated. "
 msgstr "连接到服务器终止。"
 
-#: src/net/ea/partyhandler.cpp:76
+#: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr "无法创建帮会。"
 
-#: src/net/ea/partyhandler.cpp:78
+#: src/net/ea/partyhandler.cpp:79
 msgid "Party successfully created."
 msgstr "帮会创建成功。"
 
-#: src/net/ea/partyhandler.cpp:133
+#: src/net/ea/partyhandler.cpp:134
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s已经加入你的党。"
 
-#: src/net/ea/partyhandler.cpp:169
+#: src/net/ea/partyhandler.cpp:170
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s已经是你的帮会成员了。"
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s拒绝了您的邀请。"
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s现在是你帮会中的成员了。"
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s不能加入团队，因为团队成员已满。"
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:353
+#: src/net/ea/partyhandler.cpp:355
 msgid "You have left the party."
 msgstr "你以退出帮会"
 
-#: src/net/ea/partyhandler.cpp:366
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已经离开你的帮会。"
 
-#: src/net/ea/partyhandler.cpp:443
+#: src/net/ea/partyhandler.cpp:445
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知成员尝试说：%s"
-- 
cgit v1.2.3-60-g2f50