Rebuild translations.

author: Andrei Karas <akaras@inbox.ru> 2011-08-10 01:14:29 +0300
committer: Andrei Karas <akaras@inbox.ru> 2011-08-10 01:14:29 +0300
commit: bf82d88f90e74daa4cceec7dc4c78861f389ac93 (patch)
tree: 8f683236ea1563d6030cbb54b52455fa9c407498 /po/zh_CN.po
parent: 038355b1192fe2e6b00e29e1e20cbf9d535c99aa (diff)
download: plus-bf82d88f90e74daa4cceec7dc4c78861f389ac93.tar.gz
plus-bf82d88f90e74daa4cceec7dc4c78861f389ac93.tar.bz2
plus-bf82d88f90e74daa4cceec7dc4c78861f389ac93.tar.xz
plus-bf82d88f90e74daa4cceec7dc4c78861f389ac93.zip
1 files changed, 3317 insertions, 2529 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e8e52e5a6..2adbb8e63 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,3966 +1,4754 @@
-# Simplified Chinese translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-#
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-# Hong Hao <oahong@gmail.com>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+#   <colorfullife81@gmail.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2010-01-05 23:49+0000\n"
-"Last-Translator: luojie-dune <Unknown>\n"
-"Language-Team: Chinese Simplified <themanaworld-devel@lists.sourceforge."
-"net>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"PO-Revision-Date: 2011-08-09 06:12+0000\n"
+"Last-Translator: colorful <colorfullife81@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"X-Poedit-Country: China\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:541
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:541
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1513
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1518
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "正在连接 地图 服务器..."
+msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "登录"
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
-msgstr ""
+msgstr "进入游戏世界"
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "选择角色"
+msgstr "请求字符"
 
-#: src/client.cpp:768
-#, fuzzy
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
-msgstr "正在连接 地图 服务器..."
-
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgstr "连接到游戏服务器"
+
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr "更改游戏服务器"
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: 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/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
-msgstr ""
+msgstr "申请登记的详细信息"
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "密码："
+msgstr "密码更改"
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "改变"
+msgstr ""
 
-#: src/client.cpp:863
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
-msgstr "会员晋升成功。"
+msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "注销"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "永别了，任何时候回来... ..."
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
-#, fuzzy, c-format
+#: src/client.cpp:1629
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "无效的更新主机： "
+msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- 帮助 --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/help > 显示此帮助"
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/where > 显示地图名"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > 显示在线用户数"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > 自我介绍"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > 清除此窗口"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > 发送私人信息给用户"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
+msgstr "无法发送空白密语！"
 
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > msg的别名"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "/w > msg的别名"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > 为和其他用户之间的私密信息开启一个新的标签页"
+#: src/commandhandler.cpp:445
+msgid "Party name is missing."
+msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr "/q > query的别名"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
+msgstr "公会名称是缺少的。"
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
-msgstr ""
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
+msgstr "请指定一个名称。"
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > 显示所有公共频道"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "/join > 加入或者创建一个新的频道"
-
-#: src/commandhandler.cpp:177
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > 创建一个新的帮会"
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "邀请一个用户加入队伍"
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > 开始记录聊天至外部文件"
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > 确定<回车>键是否切换聊天日志"
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > 获取列席的玩家列表（若开启logging，则发送到聊天日志）"
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > 全局通告（限GM使用）"
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "输入 /help <命令>，获取更多信息。"
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "命令： /help"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "该命令可显示所有可用命令。"
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "命令： /help <命令>"
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr "该命令显现<命令>的帮助信息"
-
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "命令： /announce <信息>"
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** 只有GM可用 ***"
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "该命令会发送<信息>给所有在线用户。"
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "命令： /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "该命令可清除历史聊天记录。"
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "命令：/item <策略>"
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "该条命令可显现当前在线用户总数。"
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr "命令：/join <频道>"
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr "该命令让您进入<频道>。"
-
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr "如果<频道>不存在，自动创建。"
-
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr "命令：/list"
-
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr "改命令列出所有频道列表。"
-
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr "命令：/me <信息>"
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
-msgstr "该命令告诉别人你正在（做）<信息>。"
-
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr "命令：/msg <昵称><信息>"
-
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr "命令：/whisper <昵称><信息>"
-
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr "命令：/w <昵称><信息>"
-
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
-msgstr "该命令发送文本<信息>给<昵称>。"
-
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
-
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr "命令：/query <昵称>"
-
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr "命令：/q <昵称>"
-
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr "该命令尝试为您和<昵称>之间的密语开启一个新的标签。"
-
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "命令：/create <帮会名>"
-
-#: src/commandhandler.cpp:254
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "这些命令创建一个被称为<帮会名>的新帮会。"
-
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr "命令：/party <昵称>"
-
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "该命令邀请<昵称>和你聚会。"
-
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr "命令： /present"
-
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr "该命令得到列席的玩家名单并传送到记录日志如果记录，否则聊天记录。"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
+msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr "命令： /record <文件名>"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
+msgstr "<回车>键现在切换聊天。"
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "该命令开始记录聊天日志至文件<文件名>。"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
+msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
-msgstr "命令: /record"
+#: src/commandhandler.cpp:555
+msgid "friend"
+msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
-msgstr "此命令结束将此会话记录"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
+msgstr "无视"
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
-msgstr "命令: /toggle <状态>"
+#: src/commandhandler.cpp:565
+msgid "neutral"
+msgstr "中性"
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr "该命令设置回车键是否切换聊天日志，或者聊天日志功能是否自动关闭。"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
+msgstr "玩家已经%s!"
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
-msgstr "<状态> 可用“1”、“yes”、“true”来开启，或以“0”、“no”、“false”关闭。"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
+msgstr "玩家成功%s!"
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
-msgstr "命令: /toggle"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
+msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr "该命令显示<回车>键切换状态"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
+msgstr "是不能忽视的！"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "命令：/item <策略>"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
+msgstr "玩家不再被忽略！"
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
-msgstr "命令: /where"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "该条命令显示当前地图名。"
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr "命令： /who"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "该条命令可显现当前在线用户总数。"
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
+msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "输入 /help 获取命令列表。"
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
-msgstr "无法发送空白密语！"
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:987
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:995
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr "请求加入频道%s。"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "帮会名称缺失。"
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr "讯息关闭聊天。"
-
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr "<回车>键现在切换聊天。"
-
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr "讯息现在关闭聊天。"
-
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "帮会创建成功。"
-
-#: src/commandhandler.cpp:486
-#, fuzzy
-msgid "Player could not be ignored!"
-msgstr "密语无法发送，你已被用户忽略。"
-
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "密语无法发送，你已被用户忽略。"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
+msgstr ""
 
-#: src/commandhandler.h:31
+#: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:172
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:326
-#, fuzzy
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
+msgstr ""
+
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "屏幕快照保存至 ~/"
+msgstr "截图保存为"
 
-#: src/game.cpp:331
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:355
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
-msgstr "与服务器连接丢失,程序将会退出."
+msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:360
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:705
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:712
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:946
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "无法加载地图"
+msgstr "不能加载地图"
 
-#: src/game.cpp:947
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
 
-#: src/gui/beingpopup.cpp:75
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "帮会（%s）"
+msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:265
+msgid "Bot Checker"
+msgstr "机器人检查"
+
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+msgid "Name"
+msgstr "姓名"
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
+msgstr "攻击"
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
+msgstr "说话"
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
+msgstr "移动"
+
+#: src/gui/botcheckerwindow.cpp:299
+msgid "Result"
+msgstr "结果"
+
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+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
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: 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
 msgid "+"
-msgstr ""
+msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: 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
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: 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/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: 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
 msgid "Max"
 msgstr "最大"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: 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:68
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr "更换Email地址"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "帐号：%s"
 
-#: src/gui/changeemaildialog.cpp:51
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr "输入新Email地址两次:"
+msgstr "两次新的电子邮件地址："
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "用户名至少需要%d个字符。"
+msgstr "新的电子邮件地址，需要至少%d个字符长。"
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "用户名不能少于%d个字符"
+msgstr "新的电子邮件地址必须小于%d个字符长。"
 
-#: src/gui/changeemaildialog.cpp:141
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
-msgstr "新电子邮件地址已经存在。"
+msgstr "电子邮件地址不匹配。"
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "更换密码"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密码："
 
-#: src/gui/changepassworddialog.cpp:63
-#, fuzzy
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr "输入新密码两次:"
+msgstr "输入两次新密码："
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
-msgstr ""
+msgstr "先输入旧密码。"
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "密码需要至少%d个字符"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "密码不能少于%d个字符。"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "姓名"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
-msgstr ""
+msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "发色："
+msgstr "头发颜色："
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
 msgstr "发型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "建立"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "帅哥"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "美女"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符"
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "确认删除角色"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色？"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr "帐号和角色管理"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
-msgstr ""
+msgstr "q登录"
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "注销"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "更换Email地址"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "关闭"
+msgstr "选择"
+
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr "默认"
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr "黑色"
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr "红色"
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr "绿色"
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr "蓝色"
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr "金"
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr "黄色"
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr "粉红色"
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr "紫"
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr "灰色"
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr "棕色"
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr "彩虹1"
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr "彩虹2"
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr "彩虹3"
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+msgid "???"
+msgstr "？？？"
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chat.cpp:287
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:605
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d 玩家出席。"
-
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "是"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "否"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: 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
+msgid "Ignore"
+msgstr "忽略"
+
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
+msgstr "地图"
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr "音乐："
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr "地图："
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr "小地图："
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr "光标："
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr "的位置："
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr "地图演员数："
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
+msgstr "%d FPS (旧的OpenGL)"
+
+#: src/gui/debugwindow.cpp:176
 #, c-format
 msgid "%d FPS"
+msgstr "%d的FPS"
+
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "主题：%s"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
+msgstr "粒子数：%d个"
+
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr "目标："
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr "目标ID："
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr "目标水平："
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "姓名：%s"
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-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 ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "粒子效果"
+#: src/gui/debugwindow.cpp:393
+#, c-format
+msgid "In: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "纹理细节"
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "环境音效"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+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
+msgid "Close"
+msgstr "关闭"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "确定"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: 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
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "帮助"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr "关闭"
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "物品栏"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr "槽："
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr "排序："
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr "na"
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr "az"
+
+#: src/gui/inventorywindow.cpp:124
+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
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: 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
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: 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
 msgid "Drop..."
-msgstr "丢弃"
+msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "槽："
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "重量："
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: 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:69
+msgid "Store"
+msgstr "存储"
+
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+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/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丢弃"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "确定"
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量。"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量。"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量。"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量。"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量"
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr "未知。"
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "重量： "
+msgstr "重量：%s"
+
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr "杀敌统计"
+
+#: src/gui/killstats.cpp:63
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset timer"
+msgstr "复位定时器"
+
+#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
+#: src/gui/killstats.cpp:224
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
+#: src/gui/killstats.cpp:233
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
+#: src/gui/killstats.cpp:236
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
+#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:322
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
+#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:371
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
+#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
+#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:360
+#, c-format
+msgid "%s %d?"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:366
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr "正常"
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr "自动关闭"
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr "跳过"
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "登录"
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "服务器："
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr "自定义更新主机"
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "保存用户名"
+msgstr "记住用户名"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr "更新日期："
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "注册"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "服务器"
+msgstr "更改服务器"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "地图"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr "需要"
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr "等待服务器中"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "下一个"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr "提交"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "重置"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
+msgstr "清除"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "下一个"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "至："
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr "发送"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:87
 msgid "Unequip first"
-msgstr "卸下装备"
+msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "文本"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
+msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "文本阴影"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr "交易"
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "文本轮廓"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
+msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "进度条标签"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
+msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: 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
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: 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
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-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
+msgid "Unignore"
+msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-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/playerrelations.cpp:400
+msgid "Completely ignore"
+msgstr "完全忽略"
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "标签加亮"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
+msgstr ""
 
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "物品太昂贵"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
+msgstr ""
 
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "物品已装备"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
+msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
+msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "玩家"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
+msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "密语"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
+msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "是"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
+msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "帮会"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
+msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "帮会"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
+msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "服务器"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
+msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "记录器"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
+msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "超链接"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
+msgstr ""
 
-# need more contents!!!
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "存在"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "其他玩家名"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "自己的名字"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
+msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM名"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "怪物"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "未知物品类型"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
+msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "一般的"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "帽子"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
+msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "可用的"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
+msgstr "加入聊天"
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "衬衫"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
+msgstr "地图项"
 
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "单手武器"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
+msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "裤子"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
+msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "鞋子"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
+msgstr ""
 
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "单手武器"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
+msgstr "法术"
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "盾"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
+msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "指环"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
+msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "项链"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
+msgstr "禁用"
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "武器"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
+msgstr "启用突出"
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "弹药"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
+msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "粒子效果"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
+msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "拾起通知"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
+msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "到期通知"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
+msgstr ""
 
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "玩家攻击怪兽"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
+msgstr "留下"
 
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "怪兽击打玩家"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
+msgstr "更改公会的立场"
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "会心一击"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
+msgstr "重命名的地图标志"
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "失误"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
+msgstr "名称："
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HP条"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
+msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 HP条"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
+msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 HP条"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
+msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 HP条"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "与%s交易中"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "攻击 %+d"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "密语"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
+msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:101
-#, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|和%s成为朋友@@"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
+msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:106
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "被忽视的"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
+msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:109
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "忽略"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, fuzzy, c-format
-msgid "Completely ignore %s"
-msgstr "@@ignore|完全忽略%s@@"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
+msgstr "找回一半"
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
+msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:133
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|邀请%s加入你的工会@@"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|邀请%s加入你的帮会@@"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-#, fuzzy
-msgid "Kick player"
-msgstr "踢出失败！"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|和%s交谈@@"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-#, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|踢掉怪物@@"
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|添加姓名至聊天@@"
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "捡起"
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|添加到聊天@@"
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "存储"
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "取回"
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
+msgstr "保存状态"
 
-#: src/gui/quitdialog.cpp:44
+#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "交换服务器"
 
-#: src/gui/quitdialog.cpp:45
+#: src/gui/quitdialog.cpp:58
 msgid "Switch character"
 msgstr "交换角色"
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "结束录制。"
-
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "不在当前录制中。"
-
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "已经录制中。"
-
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "开始录制……"
-
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "开始录制失败。"
-
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "录制中……"
-
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "停止录制"
-
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "确认："
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "电子邮件"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用户名至少需要%d个字符。"
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密码不能少于%d个字符。"
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/serverdialog.cpp:134
-#, fuzzy
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
-msgstr "选择你的服务器"
+msgstr "选择您的服务器"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "服务器："
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "端口："
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
-msgstr "服务器："
+msgstr "服务器类型："
+
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr "负载"
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "连接中..."
+msgstr "连接"
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
-msgstr "自定义鼠标"
+msgstr "自定义服务器"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "请输入服务器的IP地址和端口"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "下载服务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:417
-#, fuzzy
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
-msgstr "等待服务器中"
+msgstr "等待服务器..."
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
+msgstr "准备下载"
+
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr "错误retreiving的服务器列表！"
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr "需要较新版本"
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "声音"
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr "启用音频"
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr "启用游戏SFX"
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr "启用GUI SFX"
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr "启用音乐"
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr "启用语音聊天"
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
-msgstr ""
+msgstr "下载音乐"
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "音频"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: src/gui/setup_audio.cpp:94
-#, fuzzy
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr "无文本"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+msgstr "如果你想下载新音乐,您必须重新启动您的客!"
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
+msgstr "声音引擎"
+
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "颜色"
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
-msgstr "这就是该色彩看起来的样子"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "启用聊天记录"
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr "在调试选项卡中显示服务器的消息"
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr "标签"
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable battle tab"
+msgstr "启用战斗“选项卡"
+
+#: src/gui/setup_chat.cpp:108
+msgid "Show battle events"
+msgstr "显示的战斗事件"
+
+#: src/gui/setup_chat.cpp:111
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
+msgid "Use local time"
+msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
-msgstr "颜色"
+msgid "This is what the color looks like"
+msgstr "这就是该色彩看起来的样子"
 
-#: src/gui/setup_colors.cpp:70
-#, fuzzy
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr "类型： "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "静止的"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "脉冲"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "色谱"
 
-#: src/gui/setup_colors.cpp:92
-#, fuzzy
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr "显示： "
+msgstr "延迟："
 
-#: src/gui/setup_colors.cpp:107
-#, fuzzy
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr "红： "
+msgstr "红色："
 
-#: src/gui/setup_colors.cpp:122
-#, fuzzy
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr "绿： "
+msgstr "绿色："
 
-#: src/gui/setup_colors.cpp:137
-#, fuzzy
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr "蓝： "
+msgstr "蓝色："
+
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:334
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "校准"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr "游戏杆"
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr "键盘"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr "分配"
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr "取消分配"
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr "预设"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突。"
 
-#: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "姓名"
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "怪物"
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr "显示损坏造成的，以怪物"
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr "突出显示怪物的攻击范围"
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr "显示怪物HP栏"
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr "突出显示的地图门户网站"
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr "突出地板项目"
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr "突出显示球员的攻击范围"
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr "绘制路径"
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr "自动修复的位置"
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr "同步播放移动"
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr "疯狂的举动的程序"
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr "显示自己的HP栏"
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr "启用快速统计"
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr "显示工作"
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr "接受出售/购买请求"
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr "NPC对话"
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr "启用BOT检查"
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr "启用调试日志"
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr "低流量模式"
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "关系"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:70
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:71
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:72
 msgid "Disregarded"
 msgstr "被忽视的"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:73
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "？？？"
+#: src/gui/setup_players.cpp:74
+msgid "Erased"
+msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:247
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:249
 msgid "Allow whispers"
 msgstr "允许密语"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:252
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_players.cpp:254
 msgid "Put all whispers in tabs"
 msgstr "将所有密语放于标签夜"
 
-#: src/gui/setup_players.cpp:234
-#, fuzzy
+#: src/gui/setup_players.cpp:257
 msgid "Show gender"
-msgstr "显示姓名"
+msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:267
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:292
 msgid "When ignoring:"
 msgstr "当忽略时："
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
-msgstr "微小"
+#: src/gui/setup_players.cpp:315
+msgid "Show level"
+msgstr "显示水平"
+
+#: src/gui/setup_players.cpp:319
+msgid "Show own name"
+msgstr "显示自己的名字"
+
+#: src/gui/setup_players.cpp:323
+msgid "Target dead players"
+msgstr "目标死球员"
+
+#: src/gui/setup_players.cpp:327
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:336
+msgid "Visible names"
+msgstr "可见姓名"
+
+#: src/gui/setup_players.cpp:341
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
+msgstr "小（10）"
+
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
+msgstr "小 (11)"
+
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
+msgstr "中 (12)"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
+msgstr "大 (13)"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr "大(14)"
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr "小"
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr "巨大的 (15)"
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
-msgstr "中等"
+#: src/gui/setup_theme.cpp:140
+msgid "Theme"
+msgstr "主题"
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
-msgstr "大"
+#: src/gui/setup_theme.cpp:142
+msgid "Gui theme"
+msgstr "桂主题"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:143
+msgid "Main Font"
+msgstr "主要字体"
+
+#: src/gui/setup_theme.cpp:144
+msgid "Bold font"
+msgstr "加粗字体"
+
+#: src/gui/setup_theme.cpp:145
+msgid "Particle font"
+msgstr "粒子字体"
+
+#: src/gui/setup_theme.cpp:146
+msgid "Help font"
+msgstr "帮助字体"
+
+#: src/gui/setup_theme.cpp:147
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "字体大小"
+
+#: src/gui/setup_theme.cpp:281
+msgid "Theme Changed"
+msgstr "主题更改"
+
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
+msgid "Restart your client for the change to take effect."
+msgstr "重启您的游戏客户端以使变更生效。"
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr "软件"
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr "快速的OpenGL"
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr "安全的OpenGL"
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "无文本"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr "文本"
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "气泡，无名"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "有名气泡"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "关闭"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/gui/setup_video.cpp:294
+msgid "Hw acceleration"
+msgstr "硬件加速"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr "可见姓名"
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "粒子效果"
 
-#: src/gui/setup_video.cpp:204
-#, fuzzy
-msgid "Show own name"
-msgstr "显示姓名"
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "显示拾起通知"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "聊天中"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "作为发射武器"
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:305
+msgid "Enable opacity cache"
+msgstr ""
+
+#: src/gui/setup_video.cpp:306
+msgid "Enable map reduce"
+msgstr ""
+
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
-msgstr "FPS限制："
+msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "视频"
 
-#: src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show monster damage"
-msgstr "显示姓名"
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "头顶文字"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:236
-#, fuzzy
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
-msgstr "纹理细节"
-
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr "字体大小"
+msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
-msgstr "否"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
-#, fuzzy
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
-msgstr "切换到全屏"
+msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
-msgstr "改变成OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "分辨率已变更"
+#: src/gui/setup_video.cpp:653
+msgid "Custom resolution (example: 1024x768)"
+msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
-msgstr "重启您的游戏客户端以使变更生效。"
+#: src/gui/setup_video.cpp:654
+msgid "Enter new resolution:                "
+msgstr "输入新的分辨率:"
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
-#, fuzzy
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
-msgstr "粒子效果设置已变更。"
+msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "变更会在地图更换时生效。"
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr "购买物品"
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr "出售物品"
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr "添加"
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr "请求交易"
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr "升级"
 
-#: src/gui/skilldialog.cpp:262
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:336
+#, c-format
 msgid "Skill points available: %d"
-msgstr "技能点数：%d"
+msgstr "技能点：%d个"
 
-#: src/gui/skilldialog.cpp:314
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:413
+#, c-format
 msgid "Skill Set %d"
-msgstr "技能点数：%d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "技能"
-
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "等级：%d"
+msgstr "技能为%d"
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
 msgid "Lvl: %d"
-msgstr "等级：%d"
+msgstr "等级: %d"
+
+#: src/gui/skilldialog.cpp:537
+#, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "等级: %d（%+d）"
 
 #: src/gui/socialwindow.cpp:117
+msgid "Guild"
+msgstr "帮会"
+
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "邀请用户%s加入公会%s"
 
-#: src/gui/socialwindow.cpp:126
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:160
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "帮会已创建"
+msgstr "退出公会%s的请求。"
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "会员邀请到公会"
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
-#, fuzzy
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr "创建帮会"
+msgstr "离开公会？"
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "确定退出游戏？"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:182
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:215
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:243
+#, c-format
 msgid "Invited user %s to party."
-msgstr "邀请一个用户加入队伍"
+msgstr "邀请用户%s加入团队."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
-#, fuzzy
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr "邀请一个用户加入队伍"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "确定退出游戏？"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "创建角色"
+msgstr "建立党"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
-#, fuzzy
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
-msgstr "邀请用户"
-
-#: src/gui/socialwindow.cpp:298
-#, fuzzy
-msgid "Leave"
-msgstr "大"
+msgstr "邀请"
 
-#: src/gui/socialwindow.cpp:394
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1176
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "接受%s的邀请。"
+msgstr "接受%s团队的邀请."
 
-#: src/gui/socialwindow.cpp:400
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1186
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "拒绝%s的邀请。"
+msgstr "拒绝%s的团队邀请."
 
-#: src/gui/socialwindow.cpp:413
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1203
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "接受%s的邀请。"
+msgstr "已接受公会邀请来自%s."
 
-#: src/gui/socialwindow.cpp:419
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1213
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "拒绝%s的邀请。"
+msgstr "拒绝%s的公会邀请."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "创建公会的名为%s"
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "创建团队名字为%s的"
 
-#: src/gui/socialwindow.cpp:484
-#, fuzzy
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "帮会"
+msgstr "公会名称"
 
-#: src/gui/socialwindow.cpp:485
-#, fuzzy
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr "选择你的服务器"
+msgstr "选择你的公会的名字."
 
-#: src/gui/socialwindow.cpp:497
-#, fuzzy
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
-msgstr "接受到一个已经存在的帮会邀请。"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:502
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1315
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s已经邀请你加入帮会%s。"
+msgstr "%s邀请你加入公会%s"
 
-#: src/gui/socialwindow.cpp:507
-#, fuzzy
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr "接受帮会邀请"
+msgstr "接受邀请"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:529
-#, fuzzy
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
-msgstr "%s已经邀请你加入他们的帮会。"
+msgstr "您已被邀请您加入党。"
 
-#: src/gui/socialwindow.cpp:533
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1351
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s已经邀请你加入帮会%s。"
+msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/socialwindow.cpp:570
-#, fuzzy
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
-msgstr "帮会"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:571
-#, fuzzy
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
-msgstr "选择你的服务器"
+msgstr "选择n的名称。"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
+msgstr "特价商品"
+
+#: src/gui/statuspopup.cpp:196
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:201
+msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:206
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:211
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:216
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:221
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:239
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:243
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:253
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:258
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:263
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:268
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:273
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:278
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:283
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:288
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:296
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:300
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:304
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:308
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:312
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:326
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:331
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:348
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:352
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:356
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:374
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:378
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:382
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:386
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:390
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:394
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:398
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:402
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:411
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:415
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:419
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:423
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:427
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:431
+msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:435
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:443
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:448
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:453
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:458
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:463
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:467
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:476
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:480
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:484
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:496
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:507
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:511
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:515
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:526
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:531
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr "HP："
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr "经验："
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr "MP："
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr "职业："
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP："
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
+msgstr "角色可用点: %d"
 
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP："
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr "级别:%d (GM %d)"
 
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "经验："
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "金钱：%d"
+#: 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
+msgid "(D)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "职业："
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "角色状态可以"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "技能点数：%d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "等级：%d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-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
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:112
+msgid "No Target"
+msgstr "没有目标"
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Need Target"
+msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:119
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "Life Magic"
+msgstr "生活魔术"
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Astral Magic"
+msgstr "星芒魔术"
+
+#: src/gui/textcommandeditor.cpp:167
+msgid "Command Editor"
+msgstr "命令编辑器"
+
+#: src/gui/textcommandeditor.cpp:184
+msgid "magic"
+msgstr "魔术"
+
+#: src/gui/textcommandeditor.cpp:188
+msgid "other"
+msgstr "其他"
+
+#: src/gui/textcommandeditor.cpp:193
+msgid "Symbol:"
+msgstr "符号："
+
+#: src/gui/textcommandeditor.cpp:196
+msgid "Command:"
+msgstr "命令："
+
+#: src/gui/textcommandeditor.cpp:199
+msgid "Mana:"
+msgstr "法力："
+
+#: src/gui/textcommandeditor.cpp:205
+msgid "Target Type:"
+msgstr "目标类型："
+
+#: src/gui/textcommandeditor.cpp:211
+msgid "Icon:"
+msgstr "图示："
+
+#: src/gui/textcommandeditor.cpp:217
+msgid "Magic level:"
+msgstr "魔法等级："
+
+#: src/gui/textcommandeditor.cpp:223
+msgid "Magic School:"
+msgstr "魔法学院："
+
+#: src/gui/textcommandeditor.cpp:229
+msgid "School level:"
+msgstr "学校层次："
+
+#: src/gui/textcommandeditor.cpp:234
+msgid "Save"
+msgstr "保存"
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr "打算交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中……"
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "同意交易"
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "已同意。等待中……"
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr "交易：你"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr "交易"
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "添加"
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "你得到%s。"
+msgstr "你得到%s"
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "你给予："
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "改变"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "姓名：%s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr "更新..."
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
-#, fuzzy
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1 您稍候再次尝试"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "已完成"
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr "存在"
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr "忽略名称"
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr "其他玩家名"
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr "自己的名字"
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr "GM名"
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr "NPCs"
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr "怪物的HPl"
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr "怪物的HP指示栏(第二个颜色)"
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr "公会成员"
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr "粒子效果"
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr "拾起通知"
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr "到期通知"
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr "玩家惠普酒吧"
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr "玩家HP指示栏(第二个颜色)"
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr "玩家怪物"
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr "怪物点击播放器"
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr "其他玩家点击本土球员"
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr "会心一击"
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr "当前玩家"
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr "失误"
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr "门户高亮"
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr "步行高亮"
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr "家居广场"
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr "家居广场边界"
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr "路点"
+
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+msgid "Who Is Online - Updating"
+msgstr "谁在线 - 更新"
+
+#: src/gui/whoisonline.cpp:100
+msgid "Update"
+msgstr "更新"
+
+#: src/gui/whoisonline.cpp:293
+msgid "Who Is Online - "
+msgstr "谁在线 -"
+
+#: src/gui/whoisonline.cpp:484
+msgid "Who Is Online - error"
+msgstr "谁在线 - 错误"
+
+#: src/gui/whoisonline.cpp:515
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr "/usr > 列出当前频道的用户"
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr "/topic > 设置当前聊天频道的主题"
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr "/quit > 离开频道"
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr "/op > 使用户称为频道管理员"
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr "/kick > 把用户踢出频道"
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr "命令：/users"
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr "该命令显示当前频道的用户"
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr "命令：/topic <讯息>"
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr "该命令设置主题为<讯息>"
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr "命令：/quit"
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr "该命令离开当前频道"
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "如果你是该频道的最后成员，离开后该频道将被删除。"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr "命令：/op <昵称>"
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr "该命令使<昵称>成为频道管理员。"
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "频道管理员可以踢出或者op频道内的其他用户"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr "命令：/kick <昵称>"
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr "该命令致使<昵称>离开频道。"
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr "需要一个用户来操作"
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr "踢人时需要指定用户！"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr "全局公告："
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 全局公告："
 
-#: src/gui/widgets/chattab.cpp:150
-#, fuzzy, c-format
+#: src/gui/widgets/chattab.cpp:184
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s悄悄的对您说： "
+msgstr "%s私语:%s"
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr "无法发送空白信息！"
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > "
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > 停止忽视了其他"
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr "/close > 关闭密语标签页"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr "命令: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr "该命令关闭当前密语标签页。"
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "命令：/item"
+msgstr "命令：/ignore"
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "该条命令可显现当前在线用户总数。"
+msgstr "此命令忽略了其他，不管目前的关系。"
 
-#: src/gui/widgets/whispertab.cpp:94
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "该命令开始记录聊天日志至文件<文件名>。"
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr "命令: /uninore <>"
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "快捷键"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr "选择OK"
+msgstr "选择世界"
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "改变"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr "选择你的服务器"
+msgstr ""
+
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr "向上移动"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr "向下移动"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr "向左移动"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr "向右移动"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
-msgstr "攻击"
-
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:49
 msgid "Target & Attack"
 msgstr "对准并攻击"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
+msgstr "移动到目标"
+
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
+msgstr "更改移动到目标类型"
+
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr "移动到首页位置"
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr "设为首页位置"
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr "移动导航点"
+
+#: src/keyboardconfig.cpp:61
 msgid "Smilie"
 msgstr "笑脸"
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "说话"
-
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "停止攻击"
 
-#: src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "对准最近目标"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
+msgstr "目标最接近"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr "目标NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr "目标玩家"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr "捡起"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr "更改皮卡型"
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr "隐藏窗口"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr "屏幕快照"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr ""
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
+msgstr "更改地图浏览模式"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr "项目的快捷方式键"
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品快捷 %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr "帮助窗口"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr "状态窗口"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr "物品栏窗口"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr "装备窗口"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr "技能窗口"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr "小地图窗口"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr "聊天窗口"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr "物品快捷窗口"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr "设置窗口"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr "Debug窗口"
 
-#: src/keyboardconfig.cpp:80
-#, fuzzy
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr "技能窗口"
+msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "表情快捷窗口"
 
-#: src/keyboardconfig.cpp:82
-#, fuzzy
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
-msgstr "状态窗口"
+msgstr "装具窗口"
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
+msgstr "橱窗"
+
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr "快速下拉窗口"
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr "命令的窗口"
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr "BOT检查窗口"
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快捷键为 %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "选择OK"
-
-#: src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "忽略输入1"
-
-#: src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "忽略输入2"
-
-#: src/keyboardconfig.cpp:178
-#, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "解决按键冲突，否者游戏过程中可能发生奇怪行为。"
-
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
-msgstr "无法拾取物品。"
-
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "你捡起%s [@@%d|%s@@]。"
-msgstr[1] "你捡起%s [@@%d|%s@@]。"
-
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
-msgstr "选项："
-
-#: src/main.cpp:45
-#, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version\t:显示版本号"
-
-#: src/main.cpp:46
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help\t: 显示该帮助"
-
-#: src/main.cpp:47
-#, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file\t: 使用的配置文件"
-
-#: src/main.cpp:48
-#, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username\t:以该用户名登录游戏"
-
-#: src/main.cpp:49
-#, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password\t: 以该密码登录"
-
-#: src/main.cpp:50
-#, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character\t: 以该角色登录"
-
-#: src/main.cpp:51
-#, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server\t: 登录服务器名或IP"
-
-#: src/main.cpp:52
-#, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port\t: 登录服务器端口"
-
-#: src/main.cpp:53
-#, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host\t: 使用该更新主机"
-
-#: src/main.cpp:54
-#, fuzzy
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default\t: 选择某人角色服务器和角色"
-
-#: src/main.cpp:56
-#, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update\t:跳过下载更新"
-
-#: src/main.cpp:57
-#, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data\t: 从此目录加载游戏数据"
-
-#: src/main.cpp:58
-#, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir\t: 用该目录作为家目录"
-
-#: src/main.cpp:59
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir\t: 用该目录作为家目录"
-
-#: src/main.cpp:61
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl\t:为该次会话关闭OpenGL"
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
-msgstr "踢出失败！"
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
-msgstr "成功踢出！"
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr "自动完成交谈"
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "无物可供出售。"
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr "停用聊天输入"
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "谢谢你的购买。"
+#: src/keyboardconfig.cpp:288
+msgid "Select OK"
+msgstr "选择OK"
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "无法购买。"
+#: src/keyboardconfig.cpp:291
+msgid "Ignore input 1"
+msgstr "忽略输入1"
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "感谢您的出售。"
+#: src/keyboardconfig.cpp:293
+msgid "Ignore input 2"
+msgstr "忽略输入2"
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "无法出售."
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr "直接向上"
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "访问被拒绝"
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr "直接下"
 
-#: src/net/ea/charserverhandler.cpp:106
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "不能使用该ID"
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr "直接离开"
 
-#: src/net/ea/charserverhandler.cpp:109
-#, fuzzy
-msgid "Unknown failure to select character."
-msgstr "选择人物时遇到未知错误"
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr "直接对"
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "创建角色失败。很可能名称已被占用。"
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "信息"
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
-msgstr "角色已删除。"
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
-msgstr "删除角色失败。"
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr "快速下降序号项目"
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
-msgid "Strength:"
-msgstr "力量："
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
-msgid "Agility:"
-msgstr "敏捷："
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr "快速愈合的目标或自我"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
-msgid "Vitality:"
-msgstr "生命："
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
-msgid "Intelligence:"
-msgstr "智力："
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
-msgid "Dexterity:"
-msgstr "灵巧："
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr "切换魔法攻击"
 
-#: src/net/ea/charserverhandler.cpp:242
-msgid "Luck:"
-msgstr "幸运："
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr "更改移动类型"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "密语无法发送，用户已离线。"
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr "更改攻击型武器"
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "密语无法发送，你已被用户忽略。"
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr "更改攻击类型"
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
-msgid "MVP player."
-msgstr "玩家"
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr "更改跟随模式"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
-msgstr "聊天频道不被支持！"
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr "更改仿模式"
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "姓名"
-
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Request to quit denied!"
-msgstr "请求交易"
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr "开/关 音频"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
-msgstr "力量 %+d"
-
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
-msgstr "敏捷 %+d"
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
-msgstr "生命 %+d"
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr "从键盘模拟右键单击"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
-msgstr "智慧 %+d"
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr "切换模式"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
-msgstr "敏捷 %+d"
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/keyboardconfig.cpp:411
 #, c-format
-msgid "Luck %+d"
-msgstr "幸运 %+d"
-
-#: src/net/ea/generalhandler.cpp:130
-#, fuzzy
-msgid "Authentication failed."
-msgstr "验证失败"
-
-#: src/net/ea/generalhandler.cpp:133
-#, fuzzy
-msgid "No servers available."
-msgstr "无可用服务器"
-
-#: src/net/ea/generalhandler.cpp:137
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "某人正在尝试使用该帐号"
-
-#: src/net/ea/generalhandler.cpp:140
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "该帐号已经登录"
-
-#: src/net/ea/generalhandler.cpp:143
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "检测到调速作弊"
-
-#: src/net/ea/generalhandler.cpp:146
-#, fuzzy
-msgid "Duplicated login."
-msgstr "重复登录"
-
-#: src/net/ea/generalhandler.cpp:149
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "未知连接错误"
-
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
-msgstr "和服务器失去连接"
-
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
-msgstr "力量"
-
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
-msgstr "敏捷"
-
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
-msgstr "生命"
-
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
-msgstr "智慧"
-
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
-msgstr "敏捷"
-
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
-msgstr "幸运"
-
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "防御："
-
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
-msgid "M.Attack"
-msgstr "魔攻："
-
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Defense"
-msgstr "魔防："
-
-#: src/net/ea/generalhandler.cpp:227
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Ac精确度："
-
-#: src/net/ea/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% E回避率："
-
-#: src/net/ea/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "会心一击"
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > 显示该帮助信息。"
-
-#: src/net/ea/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > 邀请某一玩家加入您的帮会"
-
-#: src/net/ea/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > 离开你所在的帮会"
-
-#: src/net/ea/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > 把某人踢出你所在的帮会"
-
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "命令：/invite <昵称>"
-
-#: src/net/ea/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "该命令邀请<昵称>和你聚会。"
-
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "命令：/leave"
-
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "该命令致使玩家离开帮会"
-
-#: src/net/ea/gui/guildtab.cpp:89
-#, fuzzy
-msgid "Guild name is missing."
-msgstr "帮会名称缺失。"
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr "你被打死"
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-#, fuzzy
-msgid "User is now part of your guild."
-msgstr "%s现在是你帮会中的成员了。"
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-#, fuzzy
-msgid "Unknown guild invite response."
-msgstr "未知邀请应答%s。"
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > 邀请某一玩家加入您的帮会"
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > 离开你所在的帮会"
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > 把某人踢出你所在的帮会"
+#: src/localplayer.cpp:3174
+msgid "Away"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > 显示/改变帮会项目共享选项"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > 显示/改变帮会经验共享选项"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "该命令致使玩家离开帮会"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "命令：/item <策略>"
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "改命令改变帮会的物品共享策略。"
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr "你看"
 
-#: src/net/ea/gui/partytab.cpp:87
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+#: src/main.cpp:47
+msgid "manaplus [options] [mana-file]"
 msgstr ""
-"<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
-"\"false\"用来禁止物品共享。"
 
-#: src/net/ea/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "命令：/item"
+#: src/main.cpp:48
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "该命令显示帮会现有的物品共享策略。"
+#: src/main.cpp:49
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "命令：/exp <策略>"
+#: src/main.cpp:50
+msgid "              to the manaplus client."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "该命令改变帮会的经验共享策略。"
+#: src/main.cpp:52
+msgid "Options:"
+msgstr "选项："
 
-#: src/net/ea/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+#: src/main.cpp:53
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
-"<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\","
-"\"false\"用来关闭经验共享。"
 
-#: src/net/ea/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "命令：/exp"
-
-#: src/net/ea/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr "该命令显示帮会现有的经验共享策略。"
+#: src/main.cpp:54
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
-msgid "Item sharing enabled."
-msgstr "物品共享开启。"
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
-msgid "Item sharing disabled."
-msgstr "物品共享关闭。"
+#: src/main.cpp:56
+msgid "  -h --help           : Display this help"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
-msgid "Item sharing not possible."
-msgstr "物品共享不可能。"
+#: src/main.cpp:57
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
-#, fuzzy
-msgid "Item sharing unknown."
-msgstr "物品共享开启。"
+#: src/main.cpp:58
+msgid "  -U --username       : Login with this username"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
-msgid "Experience sharing enabled."
-msgstr "经验共享开启。"
+#: src/main.cpp:59
+msgid "  -P --password       : Login with this password"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
-msgid "Experience sharing disabled."
-msgstr "经验共享关闭。"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
-msgid "Experience sharing not possible."
-msgstr "经验共享不可能。"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
-#, fuzzy
-msgid "Experience sharing unknown."
-msgstr "经验共享开启。"
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
+msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
-msgid "Failed to use item."
-msgstr "使用物品失败。"
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
+msgstr "--update-host:    使用此更新主机"
 
-#: src/net/ea/inventoryhandler.cpp:391
-msgid "Unable to equip."
-msgstr "无法装备。"
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr "无法卸载装备。"
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
-msgid "Account was not found. Please re-login."
-msgstr "帐号不存在。请重新登录。"
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "原密码错误"
-
-#: src/net/ea/loginhandler.cpp:85
-#, fuzzy
-msgid "New password too short."
-msgstr "新密码太短"
-
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "未明错误"
-
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
-msgid "Unregistered ID."
-msgstr "未注册ID"
-
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
-msgid "Wrong password."
-msgstr "错误的密码"
-
-#: src/net/ea/loginhandler.cpp:155
-#, fuzzy
-msgid "Account expired."
-msgstr "帐号期满"
-
-#: src/net/ea/loginhandler.cpp:158
-#, fuzzy
-msgid "Rejected from server."
-msgstr "登录请求被拒绝"
-
-#: src/net/ea/loginhandler.cpp:161
-#, fuzzy
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr "你已被永久性禁止游戏。请联系GM团队。"
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
-"你被暂时禁止进入游戏直到%s.\n"
-"请通过论坛联系GM组"
 
-#: src/net/ea/loginhandler.cpp:172
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "该用户名已被使用"
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "无法出售."
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
+msgstr "无物可供出售。"
 
-#: src/net/ea/network.cpp:414
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "正在连接 地图 服务器..."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
+msgstr "谢谢你的购买。"
 
-#: src/net/ea/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "无法创建帮会。"
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
+msgstr "无法购买。"
 
-#: src/net/ea/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "帮会创建成功。"
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "力量"
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/manaserv/attributes.cpp:167
 #, c-format
-msgid "%s is already a member of a party."
-msgstr "%s已经是你的帮会成员了。"
+msgid "Strength %+.1f"
+msgstr "力量%+.1f"
 
-#: src/net/ea/partyhandler.cpp:122
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s拒绝了您的邀请。"
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "敏捷"
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/manaserv/attributes.cpp:180
 #, c-format
-msgid "%s is now a member of your party."
-msgstr "%s现在是你帮会中的成员了。"
+msgid "Agility %+.1f"
+msgstr "敏捷 %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "灵巧"
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/manaserv/attributes.cpp:193
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "未知邀请应答%s。"
+msgid "Dexterity %+.1f"
+msgstr "灵巧%+.1f"
 
-#: src/net/ea/partyhandler.cpp:238
-msgid "You have left the party."
-msgstr "你以退出帮会"
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "活力"
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/manaserv/attributes.cpp:206
 #, c-format
-msgid "%s has left your party."
-msgstr "%s已经离开你的帮会。"
+msgid "Vitality %+.1f"
+msgstr "活力%+.1f"
 
-#: src/net/ea/partyhandler.cpp:301
-#, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "一未知成员尝试说：%s"
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "情报"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "这种方式的邀请暂时不支持。"
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "智慧%+.1f"
 
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "意志"
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/manaserv/attributes.cpp:232
 #, c-format
-msgid "%s is not in your party!"
-msgstr "%s不在你的帮会中！"
+msgid "Willpower %+.1f"
+msgstr "意志力%+.1f"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "你已玩完了。"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "很遗憾的告诉您，您的角色在战斗中死亡了"
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "你再也不是那样的生机勃勃了。"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "游戏结束！"
 
-#: src/net/ea/playerhandler.cpp:105
-msgid "Insert coin to continue."
-msgstr "投入游戏币继续。"
-
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "不，孩子。你的角色没有真正死亡。他……呃……不过是去了一个更好的地方而已。"
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "被消灭了。"
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
-msgid "You're not dead yet. You're just resting."
-msgstr "你还没死，你只是在休息"
-
-#: src/net/ea/playerhandler.cpp:124
-msgid "You are no more."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:125
-msgid "You have ceased to be."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:126
-msgid "You've expired and gone to meet your maker."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:127
-msgid "You're a stiff."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:128
-msgid "Bereft of life, you rest in peace."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:129
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:130
-msgid "Your metabolic processes are now history."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:131
-msgid "You're off the twig."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:132
-msgid "You've kicked the bucket."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:133
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:135
-msgid "You are an ex-player."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:136
-msgid "You're pining for the fjords."
-msgstr ""
-"<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
-"\"false\"用来禁止物品共享。"
-
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
-msgid "Message"
-msgstr "讯息"
-
-#: src/net/ea/playerhandler.cpp:250
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "你已携带超过半数负重。无法回复健康（体力）"
-
-#: src/net/ea/playerhandler.cpp:333
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "你捡起 "
-
-#: src/net/ea/playerhandler.cpp:369
-msgid "Cannot raise skill!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:532
-msgid "Equip arrows first."
-msgstr "请先装备弓箭。"
-
-#: src/net/ea/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "交易失败！"
-
-#: src/net/ea/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "发送表情失败！"
-
-#: src/net/ea/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "原地休息失败！"
-
-#: src/net/ea/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "聊天创建失败！"
-
-#: src/net/ea/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "不能加入工会！"
-
-#: src/net/ea/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "无法呼喊！"
-
-#: src/net/ea/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "你还没有达到足够的等级！"
-
-#: src/net/ea/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "HP不足！"
-
-#: src/net/ea/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "SP不足！"
-
-#: src/net/ea/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "没有备忘录"
-
-#: src/net/ea/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "你无法办到！"
-
-#: src/net/ea/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "看起来需要更多金币…… ;-)"
-
-#: src/net/ea/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "此武器无法用来使用此项技能！"
-
-#: src/net/ea/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "你需要另一颗红宝石！"
-
-#: src/net/ea/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "你需要另一颗蓝宝石！"
-
-#: src/net/ea/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "你已负重太多，无法办到！"
-
-#: src/net/ea/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "啊？那是什么？"
-
-#: src/net/ea/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "传送失败..."
-
-#: src/net/ea/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "无法偷取任何物品..."
-
-#: src/net/ea/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "毒药无效..."
-
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "请求交易"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s想和您进行交易，是否接受？"
-
-#: src/net/ea/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "交易不可能进行。与交易伙伴太过太过遥远"
-
-#: src/net/ea/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "交易不可能进行。角色不存在。"
-
-#: src/net/ea/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "交易取消因不明原因。"
-
-#: src/net/ea/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "交易：您和%s"
-
-#: src/net/ea/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "与%s的交易被取消。"
-
-#: src/net/ea/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "未处理的交易取消分组。"
-
-#: src/net/ea/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "添加项目失败。交易伙伴已经负重太多。"
-
-#: src/net/ea/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
-
-#: src/net/ea/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "添加项目失败，原因未知。"
-
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "交易取消。"
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "交易完成。"
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
-msgstr " 按OK重新开始"
+msgstr "按确定以重生。"
 
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr "你完蛋了"
+msgstr "你死了"
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
-msgstr "已经登录"
+msgstr "未登录。"
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
-msgstr ""
+msgstr "无空槽。"
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
-msgstr ""
+msgstr "名称无效。"
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
-msgstr "用户名已存在"
+msgstr "人物的名字已经存在。"
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
-msgstr ""
+msgstr "无效的发型。"
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
-msgstr ""
+msgstr "头发的颜色无效。"
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
-msgstr ""
+msgstr "无效的性别。"
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr "角色状态可以"
+msgstr "字符的统计太高。"
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr "角色状态可以"
+msgstr "字符的统计过低。"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "未知的错误。"
+
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "信息"
+
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr "角色已删除。"
+msgstr "删除。"
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "请选择交易的物品数量。"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "未明错误"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr "无 游戏服务器 可用。"
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "意志力："
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr "主题：%s"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr "玩家攻击怪兽"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr "命令：/join <频道>"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr "请求加入频道%s。"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
 msgid "%s entered the channel."
-msgstr "%s加入了帮会。"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s已被%s踢出"
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "未知命令。"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr "意志力 %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "意志力："
+msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
 msgstr "帮会已创建"
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
-msgstr ""
+msgstr "创建公会时发生错误。"
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr "邀请已发送。"
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr "会员晋升成功。"
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr "晋升会员失败。"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
-msgstr "错误的 magic_token"
+msgstr "错误magic_token。"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
-msgstr "已经登录"
+msgstr "已登录。"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Server is full."
-msgstr "服务器满载"
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr "帐户被禁止。"
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr "新密码错误"
+msgstr "新密码不正确。"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "旧密码不正确。"
+
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "账户未连接。请先登录。"
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr "新电子邮件地址不正确"
+msgstr "新的电子邮件地址不正确。"
 
-#: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr "原电子邮件地址不正确"
+msgstr "旧的电子邮件地址不正确。"
 
-#: src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr "新电子邮件地址已经存在。"
+msgstr "新的电子邮件地址已存在。"
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
-msgstr ""
+msgstr "客户端注册是不允许的。请联系服务器管理。"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr "客户端版本太旧"
+msgstr "客户端版本太旧。"
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr "错误的用户名或密码"
+msgstr "用户名或密码错误。"
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr "帐户被禁止"
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
-msgstr ""
+msgstr "登录尝试后，以前的尝试还为时过早。"
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr "错误的用户名，密码或者电子邮件地址"
+msgstr "错误的用户名，密码或电子邮件地址。"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
-msgstr "用户名已存在"
+msgstr "用户名已存在。"
 
-#: src/net/manaserv/loginhandler.cpp:309
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr "电子邮件地址已存在"
+msgstr "电子邮件地址已存在。"
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+msgstr "你的时间太长与CAPTCHA或你的反应是不正确的。"
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr "加入了帮会。"
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr "%s加入了帮会。"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
 msgid "%s rejected your invite."
-msgstr "%s拒绝了您的邀请。"
+msgstr "%s的拒绝你的邀请。"
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr "正在接受交易请求"
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr "忽略交易请求"
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s想和您进行交易，是否接受？"
+
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "与%s交易中"
 
-#: src/playerrelations.cpp:304
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|完全忽略%s@@"
+#: src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "交易取消。"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#: src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "交易完成。"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "踢出失败！"
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "成功踢出！"
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "感谢您的出售。"
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "无法出售."
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr "不能出售，交易。"
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
-msgstr "攻击 %+d"
+msgid "Strength %+d"
+msgstr "力量 %+d"
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
-msgstr "防护 %+d"
+msgid "Agility %+d"
+msgstr "敏捷 %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+msgid "Vitality %+d"
+msgstr "生命 %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "未知物品"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "未知怪兽"
-
-#~ msgid "no"
-#~ msgstr "不"
-
-#~ msgid "Buddy"
-#~ msgstr "好友"
-
-#~ msgid "Buddy List"
-#~ msgstr "好友列表"
-
-#~ msgid "Description: %s"
-#~ msgstr "描述：%s"
-
-#~ msgid "Effect: %s"
-#~ msgstr "效果：%s"
-
-#~ msgid "Previous"
-#~ msgstr "上一个"
-
-#~ msgid "New"
-#~ msgstr "新建"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "职业等级：%d"
-
-#~ msgid "Present: "
-#~ msgstr "出席： "
-
-#~ msgid "Quit Guild"
-#~ msgstr "退出帮会"
-
-#~ msgid "Ok"
-#~ msgstr "确定"
-
-#~ msgid "Recent:"
-#~ msgstr "最近的"
-
-#~ msgid "Magic"
-#~ msgstr "魔法"
-
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "释放测试符咒1"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "释放测试符咒2"
-
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "释放测试符咒3"
-
-#~ msgid "2 Handed Weapons"
-#~ msgstr "双手武器"
-
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|与%s交易@@"
-
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|攻击%s@@"
-
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|忽视%s@@"
-
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|忽略%s@@"
-
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Un-Ignore %s@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|取消@@"
-
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|捡起%s@@"
-
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|卸载@@"
-
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|装备@@"
-
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|使用@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|丢弃@@"
-
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|分离@@"
-
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|存贮@@"
-
-#~ msgid "Select Server"
-#~ msgstr "选择服务器"
-
-#~ msgid "Failed to switch to "
-#~ msgstr "切换到此时失败： "
-
-#~ msgid "windowed"
-#~ msgstr "窗口化"
-
-#~ msgid "fullscreen"
-#~ msgstr "全屏"
-
-#~ msgid "Mystery Skill"
-#~ msgstr "神秘技能"
-
-#~ msgid "Weapons"
-#~ msgstr "武器"
-
-#~ msgid "Crafts"
-#~ msgstr "技艺"
-
-#~ msgid "Stats"
-#~ msgstr "状态"
-
-#~ msgid "Total"
-#~ msgstr "总计"
+msgid "Intelligence %+d"
+msgstr "智慧 %+d"
 
-#~ msgid "Cost"
-#~ msgstr "花费"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "敏捷 %+d"
 
-#~ msgid "Attack:"
-#~ msgstr "攻击:"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "幸运 %+d"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% 伤害反射："
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr "身份验证失败。"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "剩余状态点数：%d"
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr "没有可用的服务器。"
 
-#~ msgid "Max level"
-#~ msgstr "最大等级"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr "别人尝试使用该帐户。"
 
-#~ msgid "curl error "
-#~ msgstr "curl错误 "
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr "此帐户已登录。"
 
-#~ msgid " host: "
-#~ msgstr " 主机： "
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr "检测速度劈。"
 
-#~ msgid "Guilds"
-#~ msgstr "工会"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr "重复登录。"
 
-#~ msgid "Buddys"
-#~ msgstr "好友"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Party Window"
-#~ msgstr "帮会窗口"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "和服务器失去连接"
 
-#~ msgid "Unarmed"
-#~ msgstr "徒手的"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "幸运"
 
-#~ msgid "Knife"
-#~ msgstr "匕首"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr "国防"
 
-#~ msgid "Sword"
-#~ msgstr "剑"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-# 长斧？
-#~ msgid "Polearm"
-#~ msgstr "戟"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "Staff"
-#~ msgstr "工作人员"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr "％精度"
 
-#~ msgid "Whip"
-#~ msgstr "抖动"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr "％闪避"
 
-#~ msgid "Bow"
-#~ msgstr "弓"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr "％"
 
-#~ msgid "Shooting"
-#~ msgstr "射击"
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr "攻击延迟"
 
-#~ msgid "Mace"
-#~ msgstr "狼牙棒"
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr "步行延迟"
 
-#~ msgid "Axe"
-#~ msgstr "斧头"
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr "攻击范围"
 
-#~ msgid "Thrown"
-#~ msgstr "投掷"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr "空的地址给网络：连接（）！"
 
-#~ msgid "Unknown Skill"
-#~ msgstr "未知技能"
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " 不能被创建，不存在！退出中。"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr "连接到服务器终止。"
 
-#~ msgid "Couldn't set "
-#~ msgstr "无法设置 "
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s不在你的帮会中！"
 
-#~ msgid " video mode: "
-#~ msgstr " 视频模式： "
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "正在连接 角色 服务器..."
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "正在连接 帐号 服务器..."
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > create之别名"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "未知怪兽"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "命令： /new <帮会名>"
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "攻击 %+d"
 
-#~ msgid "a"
-#~ msgstr "一个"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "防护 %+d"
 
-#~ msgid "Unnamed"
-#~ msgstr "未知物品"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@捡起|捡起%s@@"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#~ msgid "Save player list"
-#~ msgstr "保存玩家列表"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "未知物品"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Scroll laziness"
 
-#~ msgid "Scroll radius"
-#~ msgstr "滑动半径"
author	Andrei Karas <akaras@inbox.ru>	2011-08-10 01:14:29 +0300
committer	Andrei Karas <akaras@inbox.ru>	2011-08-10 01:14:29 +0300
commit	bf82d88f90e74daa4cceec7dc4c78861f389ac93 (patch)
tree	8f683236ea1563d6030cbb54b52455fa9c407498 /po/zh_CN.po
parent	038355b1192fe2e6b00e29e1e20cbf9d535c99aa (diff)
download	plus-bf82d88f90e74daa4cceec7dc4c78861f389ac93.tar.gz plus-bf82d88f90e74daa4cceec7dc4c78861f389ac93.tar.bz2 plus-bf82d88f90e74daa4cceec7dc4c78861f389ac93.tar.xz plus-bf82d88f90e74daa4cceec7dc4c78861f389ac93.zip