1 files changed, 330 insertions, 291 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 031fde9c..fa60898c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,115 +7,156 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
-"PO-Revision-Date: 2008-09-17 14:41+0000\n"
-"Last-Translator: luojie-dune <Unknown>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
+"POT-Creation-Date: 2009-01-19 21:00+0100\n"
+"PO-Revision-Date: 2009-01-21 22:42+0800\n"
+"Last-Translator: Hong Hao <oahong@gmail.com>\n"
+"Language-Team: Simplified Chinese <themanaworld-devel@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Launchpad-Export-Date: 2009-01-21 13:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+"Plural-Forms: nplurals=2; plural=1;\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: China\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: src/gui/buy.cpp:43
+#: src/gui/buy.cpp:61
+#: src/gui/buysell.cpp:35
 msgid "Buy"
-msgstr "买"
+msgstr "购买"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:58
+#: src/gui/buy.cpp:239
+#: src/gui/sell.cpp:65
 #: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
-msgstr "价格：%d GP/总数：%d GP"
+msgstr "价格：%d 金币/总数：%d 金币"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: src/gui/buy.cpp:62
+#: src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: src/gui/buy.cpp:63
+#: src/gui/buy.cpp:206
+#: src/gui/buy.cpp:224
+#: src/gui/inventorywindow.cpp:150
+#: src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:70
+#: src/gui/sell.cpp:230
+#: src/gui/sell.cpp:244
+#: src/gui/trade.cpp:94
+#: src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: src/gui/buy.cpp:64
+#: src/gui/buy.cpp:208
+#: src/gui/buy.cpp:225
+#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:71
+#: src/gui/sell.cpp:232
+#: src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
-msgstr "影响: %s"
+msgstr "效果：%s"
 
 #: src/gui/buysell.cpp:31
-#, fuzzy
 msgid "Shop"
-msgstr "停止"
+msgstr "商店"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: src/gui/buysell.cpp:35
+#: src/gui/sell.cpp:48
+#: src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: src/gui/buysell.cpp:35
+#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258
+#: src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:61
+#: src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45
+#: src/gui/register.cpp:90
+#: src/gui/setup.cpp:59
+#: src/gui/trade.cpp:63
+#: src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "取消"
 
 #: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
-msgstr ""
+msgstr "确认删除角色"
 
 #: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
-msgstr "你确定想删除这个较色"
+msgstr "你确定想删除这个角色？"
 
 #: src/gui/char_select.cpp:81
 msgid "Select Character"
-msgstr "选择较色"
+msgstr "选择角色"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+#: src/gui/char_select.cpp:84
+#: src/gui/item_amount.cpp:60
+#: src/gui/login.cpp:51
+#: src/gui/ok_dialog.cpp:37
+#: src/gui/trade.cpp:62
 msgid "Ok"
-msgstr "OK"
+msgstr "确认"
 
 #: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "新建"
 
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
+#: src/gui/char_select.cpp:87
+#: src/gui/setup_players.cpp:223
 msgid "Delete"
 msgstr "删除"
 
 #: src/gui/char_select.cpp:88
 msgid "Previous"
-msgstr "上一页"
+msgstr "上一个"
 
 #: src/gui/char_select.cpp:89
 msgid "Next"
-msgstr "下一页"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+msgstr "下一个"
+
+#: src/gui/char_select.cpp:91
+#: src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183
+#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156
+#: src/gui/trade.cpp:92
+#: src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
-msgstr "名字：%s"
+msgstr "姓名：%s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#: src/gui/char_select.cpp:92
+#: src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184
+#: src/gui/status.cpp:51
+#: src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:93
+#: src/gui/char_select.cpp:173
 #: src/gui/char_select.cpp:185
-#, fuzzy, c-format
+#, c-format
 msgid "Job Level: %d"
-msgstr "等级：%d"
+msgstr "职业等级：%d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "金钱：%d"
@@ -123,256 +164,261 @@ msgstr "金钱：%d"
 #: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
-msgstr ""
+msgstr "金币：%d"
 
 #: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250
+#: src/gui/login.cpp:44
+#: src/gui/register.cpp:79
 msgid "Name:"
-msgstr "名称"
+msgstr "姓名："
 
 #: src/gui/char_select.cpp:253
 msgid "Hair Color:"
-msgstr "头发颜色"
+msgstr "发色："
 
 #: src/gui/char_select.cpp:256
 msgid "Hair Style:"
-msgstr "发型"
+msgstr "发型："
 
 #: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "建立"
 
 #: src/gui/char_server.cpp:52
-#, fuzzy
 msgid "Select Server"
-msgstr "选择较色"
+msgstr "选择服务器"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/char_server.cpp:59
+#: src/gui/npclistdialog.cpp:44
 #: src/gui/npc_text.cpp:46
 msgid "OK"
-msgstr ""
+msgstr "确定"
 
 #: src/gui/chat.cpp:122
 msgid "Global announcement:"
-msgstr ""
+msgstr "全局公告："
 
 #: src/gui/chat.cpp:125
 #, c-format
 msgid "Global announcement from %s:"
-msgstr ""
+msgstr "%s 全局公告："
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: src/gui/chat.cpp:140
+#: src/gui/login.cpp:46
+#: src/gui/register.cpp:82
 msgid "Server:"
 msgstr "服务器："
 
 #: src/gui/chat.cpp:146
 #, c-format
 msgid "%s whispers:"
-msgstr ""
+msgstr "%s悄悄对你说："
 
 #: src/gui/chat.cpp:283
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "对%s窃窃私语：%s"
 
 #: src/gui/chat.cpp:356
 msgid "Unknown command"
-msgstr ""
+msgstr "未知指令"
 
 #: src/gui/chat.cpp:366
 msgid "Trade failed!"
-msgstr ""
+msgstr "交易失败！"
 
 #: src/gui/chat.cpp:369
 msgid "Emote failed!"
-msgstr ""
+msgstr "发送表情失败！"
 
 #: src/gui/chat.cpp:372
 msgid "Sit failed!"
-msgstr ""
+msgstr "原地休息失败！"
 
 #: src/gui/chat.cpp:375
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "聊天创建失败！"
 
 #: src/gui/chat.cpp:378
 msgid "Could not join party!"
-msgstr ""
+msgstr "不能加入工会！"
 
 #: src/gui/chat.cpp:381
 msgid "Cannot shout!"
-msgstr ""
+msgstr "无法呼喊！"
 
 #: src/gui/chat.cpp:389
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "你还没有达到足够的等级！"
 
 #: src/gui/chat.cpp:392
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "HP不足！"
 
 #: src/gui/chat.cpp:395
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "SP不足！"
 
 #: src/gui/chat.cpp:398
 msgid "You have no memos!"
-msgstr ""
+msgstr "没有备忘录"
 
 #: src/gui/chat.cpp:401
+#, fuzzy
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "你现在无法办到！"
 
 #: src/gui/chat.cpp:404
 msgid "Seems you need more Zeny... ;-)"
-msgstr ""
+msgstr "你需要更多钞票……;-)"
 
 #: src/gui/chat.cpp:407
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "此武器无法用来使用此项技能！"
 
 #: src/gui/chat.cpp:410
 msgid "You need another red gem!"
-msgstr ""
+msgstr "你需要另一颗红宝石！"
 
 #: src/gui/chat.cpp:413
 msgid "You need another blue gem!"
-msgstr ""
+msgstr "你需要另一颗蓝宝石！"
 
 #: src/gui/chat.cpp:416
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "你已负重太多，无法办到！"
 
 #: src/gui/chat.cpp:419
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "啊？那是什么？"
 
 #: src/gui/chat.cpp:425
 msgid "Warp failed..."
-msgstr ""
+msgstr "传送失败..."
 
 #: src/gui/chat.cpp:428
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "无法偷取任何物品..."
 
 #: src/gui/chat.cpp:431
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "毒药无效..."
 
 #: src/gui/chat.cpp:496
 msgid "-- Help --"
-msgstr ""
+msgstr "-- 帮助 --"
 
 #: src/gui/chat.cpp:499
 msgid "/announce: Global announcement (GM only)"
-msgstr ""
+msgstr "/announce: 全局通告（只有GM可使用）"
 
 #: src/gui/chat.cpp:500
 msgid "/clear: Clears this window"
-msgstr ""
+msgstr "/clear: 清除聊天记录"
 
 #: src/gui/chat.cpp:501
 msgid "/help: Display this help"
-msgstr ""
+msgstr "/help: 显示帮助信息"
 
 #: src/gui/chat.cpp:502
 msgid "/where: Display map name"
-msgstr ""
+msgstr "/where: 显示地图名称"
 
 #: src/gui/chat.cpp:503
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
-msgstr ""
+msgstr "/whisper <昵称> <信息>： 发送一条私密信息 <信息> 给 <昵称>"
 
 #: src/gui/chat.cpp:505
 msgid "/w <nick> <message>: Short form for /whisper"
-msgstr ""
+msgstr "/w <昵称> <信息>: /whisper的缩写形式"
 
 #: src/gui/chat.cpp:506
 msgid "/who: Display number of online users"
-msgstr ""
+msgstr "/who: 显示在线用户数"
 
 #: src/gui/chat.cpp:507
 msgid "For more information, type /help <command>"
-msgstr ""
+msgstr "输入/help <指令> 获取更多帮助信息"
 
 #: src/gui/chat.cpp:512
 msgid "Command: /announce <msg>"
-msgstr ""
+msgstr "指令： /announce <信息>"
 
 #: src/gui/chat.cpp:513
 msgid "*** only available to a GM ***"
-msgstr ""
+msgstr "*** 只有GM可用 ***"
 
 #: src/gui/chat.cpp:514
 msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
+msgstr "该指令会发送<信息>给所有在线用户。"
 
 #: src/gui/chat.cpp:520
 msgid "Command: /clear"
-msgstr ""
+msgstr "指令： /clear"
 
 #: src/gui/chat.cpp:521
 msgid "This command clears the chat log of previous chat."
-msgstr ""
+msgstr "该指令可清除历史聊天记录。"
 
 #: src/gui/chat.cpp:527
 msgid "Command: /help"
-msgstr ""
+msgstr "指令： /help"
 
 #: src/gui/chat.cpp:528
 msgid "This command displays a list of all commands available."
-msgstr ""
+msgstr "该指令可显示所有可用指令。"
 
 #: src/gui/chat.cpp:530
 msgid "Command: /help <command>"
-msgstr ""
+msgstr "指令： /help <指令>"
 
 #: src/gui/chat.cpp:531
 msgid "This command displays help on <command>."
-msgstr ""
+msgstr "该指令显现<指令>的帮助信息"
 
 #: src/gui/chat.cpp:536
 msgid "Command: /where"
-msgstr ""
+msgstr "指令: /where"
 
 #: src/gui/chat.cpp:537
 msgid "This command displays the name of the current map."
-msgstr ""
+msgstr "该条指令显示当前地图名。"
 
 #: src/gui/chat.cpp:543
 msgid "Command: /whisper <nick> <msg>"
-msgstr ""
+msgstr "指令： /whisper <昵称> <信息>"
 
 #: src/gui/chat.cpp:544
 msgid "Command: /w <nick> <msg>"
-msgstr ""
+msgstr "指令： /w <昵称> <信息>"
 
 #: src/gui/chat.cpp:545
 msgid "This command sends the message <msg> to <nick>."
-msgstr ""
+msgstr "该条指令发送信息 <msg> 给 <nick>"
 
 #: src/gui/chat.cpp:547
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
+msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
 
 #: src/gui/chat.cpp:553
 msgid "Command: /who"
-msgstr ""
+msgstr "指令： /who"
 
 #: src/gui/chat.cpp:554
 msgid "This command displays the number of players currently online."
-msgstr ""
+msgstr "该条指令可显现当前在线用户总数。"
 
 #: src/gui/chat.cpp:558
 msgid "Unknown command."
-msgstr ""
+msgstr "未知命令"
 
 #: src/gui/chat.cpp:559
 msgid "Type /help for a list of commands."
-msgstr ""
+msgstr "输入 /help 获取指令列表。"
 
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
@@ -382,27 +428,31 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: src/gui/connection.cpp:49
+#: src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: src/gui/equipmentwindow.cpp:38
+#: src/gui/menuwindow.cpp:62
 msgid "Equipment"
 msgstr "装备"
 
 #: src/gui/help.cpp:33
 msgid "Help"
-msgstr ""
+msgstr "帮助"
 
 #: src/gui/help.cpp:41
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: src/gui/inventorywindow.cpp:46
+#: src/gui/menuwindow.cpp:63
 msgid "Inventory"
-msgstr "清单"
+msgstr "物品栏"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/inventorywindow.cpp:56
+#: src/gui/inventorywindow.cpp:232
 #: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "使用"
@@ -414,12 +464,12 @@ msgstr "丢弃"
 #: src/gui/inventorywindow.cpp:99
 #, c-format
 msgid "Weight: %d / %d"
-msgstr ""
+msgstr "负重：%d / %d"
 
 #: src/gui/inventorywindow.cpp:104
 #, c-format
 msgid "Slots used: %d / %d"
-msgstr ""
+msgstr "已使用槽： %d / %d"
 
 #: src/gui/inventorywindow.cpp:225
 msgid "Unequip"
@@ -439,17 +489,20 @@ msgstr "请选择丢弃的物品数量"
 
 #: src/gui/login.cpp:42
 msgid "Login"
-msgstr "登陆"
+msgstr "登录"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: src/gui/login.cpp:45
+#: src/gui/register.cpp:80
 msgid "Password:"
 msgstr "密码："
 
 #: src/gui/login.cpp:50
 msgid "Remember Username"
-msgstr ""
+msgstr "保存用户名"
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: src/gui/login.cpp:53
+#: src/gui/register.cpp:75
+#: src/gui/register.cpp:89
 msgid "Register"
 msgstr "注册"
 
@@ -457,7 +510,8 @@ msgstr "注册"
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: src/gui/menuwindow.cpp:64
+#: src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "技能"
 
@@ -465,15 +519,18 @@ msgstr "技能"
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66
+#: src/gui/setup.cpp:51
+#: src/main.cpp:716
 msgid "Setup"
-msgstr "安装"
+msgstr "设置"
 
 #: src/gui/minimap.cpp:34
 msgid "MiniMap"
 msgstr "小地图"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npclistdialog.cpp:35
+#: src/gui/npc_text.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
@@ -491,7 +548,8 @@ msgstr "@@攻击|攻击%s@@"
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@谈话|和NPC谈话@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:140
 #: src/gui/popupmenu.cpp:293
 msgid "@@cancel|Cancel@@"
 msgstr "@@取消|取消@@"
@@ -502,9 +560,8 @@ msgid "@@pickup|Pick Up %s@@"
 msgstr "@@捡起|捡起%s@@"
 
 #: src/gui/popupmenu.cpp:283
-#, fuzzy
 msgid "@@use|Unequip@@"
-msgstr "@@使用|装备@@"
+msgstr "@@使用|卸载@@"
 
 #: src/gui/popupmenu.cpp:285
 msgid "@@use|Equip@@"
@@ -522,63 +579,64 @@ msgstr "@@丢弃|丢弃@@"
 msgid "@@description|Description@@"
 msgstr "@@描述|描述@@"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:81
 msgid "Confirm:"
-msgstr "确定"
+msgstr "确认："
 
-#: src/gui/register.cpp:73
+#: src/gui/register.cpp:87
 msgid "Male"
-msgstr ""
+msgstr "帅哥"
 
-#: src/gui/register.cpp:74
+#: src/gui/register.cpp:88
 msgid "Female"
-msgstr ""
+msgstr "美女"
 
-#: src/gui/register.cpp:176
+#: src/gui/register.cpp:159
 #, c-format
 msgid "The username needs to be at least %d characters long."
-msgstr "用户名至少需要%d个字符"
+msgstr "用户名至少需要%d个字符。"
 
-#: src/gui/register.cpp:184
+#: src/gui/register.cpp:167
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: src/gui/register.cpp:192
+#: src/gui/register.cpp:175
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: src/gui/register.cpp:200
+#: src/gui/register.cpp:183
 #, c-format
 msgid "The password needs to be less than %d characters long."
-msgstr "密码不能少于%d个字符"
+msgstr "密码不能少于%d个字符。"
 
-#: src/gui/register.cpp:207
+#: src/gui/register.cpp:190
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: src/gui/register.cpp:210
+#: src/main.cpp:945
 msgid "Error"
 msgstr "错误"
 
-#: src/gui/setup_audio.cpp:40
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "声音"
 
-#: src/gui/setup_audio.cpp:46
+#: src/gui/setup_audio.cpp:48
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:49
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: src/gui/setup.cpp:58
+#: src/gui/setup.cpp:59
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:58
+#: src/gui/setup.cpp:59
 msgid "Reset Windows"
 msgstr "重置窗口"
 
@@ -596,267 +654,269 @@ msgstr "游戏杆"
 
 #: src/gui/setup.cpp:91
 msgid "Keyboard"
-msgstr ""
+msgstr "键盘"
 
 #: src/gui/setup.cpp:95
 msgid "Players"
-msgstr ""
+msgstr "玩家"
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: src/gui/setup_joystick.cpp:40
+#: src/gui/setup_joystick.cpp:76
 msgid "Calibrate"
 msgstr "校准"
 
-#: src/gui/setup_joystick.cpp:38
+#: src/gui/setup_joystick.cpp:41
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
-#: src/gui/setup_joystick.cpp:73
+#: src/gui/setup_joystick.cpp:81
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:74
+#: src/gui/setup_joystick.cpp:82
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
 #: src/gui/setup_keyboard.cpp:88
 msgid "Assign"
-msgstr ""
+msgstr "分配"
 
-#: src/gui/setup_keyboard.cpp:94
-#, fuzzy
+#: src/gui/setup_keyboard.cpp:92
 msgid "Default"
-msgstr "删除"
+msgstr "预设"
 
-#: src/gui/setup_keyboard.cpp:115
+#: src/gui/setup_keyboard.cpp:121
 msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "检测到按键冲突。"
 
-#: src/gui/setup_keyboard.cpp:116
+#: src/gui/setup_keyboard.cpp:122
 msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr ""
+msgstr "解决按键冲突，否者游戏过程中可能发生奇怪行为。"
 
-#: src/gui/setup_players.cpp:53
-#, fuzzy
+#: src/gui/setup_players.cpp:55
 msgid "Name"
-msgstr "名称"
+msgstr "姓名"
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:56
 msgid "Relation"
-msgstr ""
+msgstr "关系"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:60
 msgid "Neutral"
-msgstr ""
+msgstr "中立"
 
-#: src/gui/setup_players.cpp:59
+#: src/gui/setup_players.cpp:61
 msgid "Friend"
-msgstr ""
+msgstr "好友"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:62
+#, fuzzy
 msgid "Disregarded"
-msgstr ""
+msgstr "无视"
 
-#: src/gui/setup_players.cpp:61
+#: src/gui/setup_players.cpp:63
 msgid "Ignored"
-msgstr ""
+msgstr "忽略"
 
-#: src/gui/setup_players.cpp:214
+#: src/gui/setup_players.cpp:217
 msgid "Save player list"
-msgstr ""
+msgstr "保存玩家列表"
 
-#: src/gui/setup_players.cpp:216
+#: src/gui/setup_players.cpp:219
 msgid "Allow trading"
-msgstr ""
+msgstr "允许交易"
 
-#: src/gui/setup_players.cpp:218
+#: src/gui/setup_players.cpp:221
 msgid "Allow whispers"
-msgstr ""
+msgstr "允许私语"
 
-#: src/gui/setup_players.cpp:245
+#: src/gui/setup_players.cpp:248
 msgid "When ignoring:"
-msgstr ""
+msgstr "当忽略时："
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
-msgstr "通常的光标"
+msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:118
 msgid "FPS Limit:"
-msgstr "FPS限制"
+msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:135
+#: src/gui/setup_video.cpp:139
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:192
+#: src/gui/setup_video.cpp:141
 msgid "Scroll radius"
-msgstr "滚动半径"
+msgstr "滑动半径"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:142
 msgid "Scroll laziness"
-msgstr "拉动极限"
+msgstr "滑动延迟"
 
-#: src/gui/setup_video.cpp:208
+#: src/gui/setup_video.cpp:143
+#, fuzzy
 msgid "Ambient FX"
-msgstr "环境音效"
+msgstr "雾化效果"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:144
+msgid "Particle Detail"
+msgstr "纹理细节"
+
+#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:398
 msgid "off"
-msgstr "离线"
+msgstr "关闭"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:212
+#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:415
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:218
+#: src/gui/setup_video.cpp:404
+#: src/gui/setup_video.cpp:421
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:227
-msgid "Particle Detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: src/gui/setup_video.cpp:215
+#: src/gui/setup_video.cpp:418
 msgid "medium"
-msgstr ""
+msgstr "中"
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:424
 msgid "max"
-msgstr ""
+msgstr "最大"
 
-#: src/gui/setup_video.cpp:309
+#: src/gui/setup_video.cpp:296
 msgid "Switching to full screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:310
+#: src/gui/setup_video.cpp:297
 msgid "Restart needed for changes to take effect."
-msgstr "只有改变生效后才能重启"
+msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:309
 msgid "Changing OpenGL"
 msgstr "改变成OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:310
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
 #: src/gui/skill.cpp:79
 msgid "Mystery Skill"
-msgstr ""
+msgstr "神秘技能"
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: src/gui/skill.cpp:132
+#: src/gui/skill.cpp:188
 #, c-format
 msgid "Skill points: %d"
-msgstr ""
+msgstr "技能点数：%d"
 
 #: src/gui/skill.cpp:133
 msgid "Up"
-msgstr ""
+msgstr "升级"
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
-#, fuzzy, c-format
+#: src/gui/status.cpp:52
+#: src/gui/status.cpp:235
+#, c-format
 msgid "Job: %d"
-msgstr "等级：%d"
+msgstr "职业：%d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
-#, fuzzy, c-format
+#: src/gui/status.cpp:53
+#: src/gui/status.cpp:238
+#, c-format
 msgid "Money: %d GP"
-msgstr "金钱：%d"
+msgstr "金钱：%d 金币"
 
 #: src/gui/status.cpp:127
-#, fuzzy
 msgid "Stats"
 msgstr "状态"
 
 #: src/gui/status.cpp:128
 msgid "Total"
-msgstr ""
+msgstr "总计"
 
 #: src/gui/status.cpp:129
 msgid "Cost"
-msgstr ""
+msgstr "花费"
 
 #: src/gui/status.cpp:132
-#, fuzzy
 msgid "Attack:"
-msgstr "攻击 %+d"
+msgstr "攻击:"
 
 #: src/gui/status.cpp:133
-#, fuzzy
 msgid "Defense:"
-msgstr "防护 %+d"
+msgstr "防御："
 
 #: src/gui/status.cpp:134
-#, fuzzy
 msgid "M.Attack:"
-msgstr "攻击 %+d"
+msgstr "魔攻："
 
 #: src/gui/status.cpp:135
-#, fuzzy
 msgid "M.Defense:"
-msgstr "防护 %+d"
+msgstr "魔防："
 
 #: src/gui/status.cpp:136
 #, c-format
 msgid "% Accuracy:"
-msgstr ""
+msgstr "% Ac精确度："
 
 #: src/gui/status.cpp:137
 #, c-format
 msgid "% Evade:"
-msgstr ""
+msgstr "% E回避率："
 
 #: src/gui/status.cpp:138
 msgid "% Reflex:"
-msgstr ""
+msgstr "% 伤害反射："
 
 #: src/gui/status.cpp:282
-#, fuzzy
 msgid "Strength"
 msgstr "力量"
 
 #: src/gui/status.cpp:283
-#, fuzzy
 msgid "Agility"
-msgstr "敏捷:"
+msgstr "敏捷"
 
 #: src/gui/status.cpp:284
-#, fuzzy
 msgid "Vitality"
-msgstr "体力:"
+msgstr "生命"
 
 #: src/gui/status.cpp:285
-#, fuzzy
 msgid "Intelligence"
-msgstr "智力:"
+msgstr "智慧"
 
 #: src/gui/status.cpp:286
-#, fuzzy
 msgid "Dexterity"
-msgstr "智慧:"
+msgstr "敏捷"
 
 #: src/gui/status.cpp:287
 msgid "Luck"
-msgstr ""
+msgstr "幸运"
 
 #: src/gui/status.cpp:305
 #, c-format
 msgid "Remaining Status Points: %d"
-msgstr ""
+msgstr "剩余状态点数：%d"
 
 #: src/gui/trade.cpp:61
 msgid "Add"
@@ -864,122 +924,101 @@ msgstr "添加"
 
 #: src/gui/trade.cpp:64
 msgid "Trade"
-msgstr ""
+msgstr "交易"
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: src/gui/trade.cpp:80
+#: src/gui/trade.cpp:156
+#: src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "你得到%d GP."
 
 #: src/gui/trade.cpp:81
 msgid "You give:"
-msgstr "你得到："
+msgstr "你付出:"
 
 #: src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
+msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
 #: src/gui/updatewindow.cpp:93
 msgid "Updating..."
-msgstr ""
+msgstr "更新..."
 
 #: src/gui/updatewindow.cpp:119
 msgid "Play"
-msgstr ""
+msgstr "开始"
 
-#: src/gui/updatewindow.cpp:525
+#: src/gui/updatewindow.cpp:526
 msgid "Completed"
-msgstr ""
+msgstr "已完成"
 
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
-msgstr ""
+msgstr "未知物品"
 
 #: src/main.cpp:769
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "和服务器失去连接"
 
 #: src/main.cpp:956
-#, fuzzy
 msgid "Connecting to map server..."
-msgstr "连接中..."
+msgstr "正在连接 地图 服务器..."
 
 #: src/main.cpp:964
 msgid "Connecting to character server..."
-msgstr ""
+msgstr "正在连接 角色 服务器..."
 
 #: src/main.cpp:972
 msgid "Connecting to account server..."
-msgstr ""
+msgstr "正在连接 帐号 服务器..."
 
+#~ msgid "Change"
+#~ msgstr "改变"
 #~ msgid "Unregister"
 #~ msgstr "注销"
-
 #~ msgid "Willpower:"
 #~ msgstr "意志力:"
-
 #~ msgid "Please distribute %d points"
 #~ msgstr "请分发%d点数"
-
 #~ msgid "Your name needs to be at least 4 characters."
 #~ msgstr "你的名字需要至少4个字符"
-
 #~ msgid "Character stats OK"
 #~ msgstr "角色状态可以"
-
 #~ msgid "Please remove %d points"
 #~ msgstr "请删除%d点数"
-
 #~ msgid "Split"
 #~ msgstr "分离"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "请选择你分离的物品的数量"
-
 #~ msgid "@@split|Split@@"
 #~ msgstr "@@分离|分离@@"
-
 #~ msgid "Switch server"
 #~ msgstr "交换服务器"
-
 #~ msgid "Switch character"
 #~ msgstr "交换角色"
-
 #~ msgid "Email:"
 #~ msgstr "电子邮件"
-
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "请选择你的魔法世界服务器"
-
 #~ msgid "Port:"
 #~ msgstr "端口："
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "请输入服务器的IP地址和端口"
-
 #~ msgid "Propose trade"
 #~ msgstr "打算交易"
-
 #~ msgid "Confirm trade"
 #~ msgstr "决定交易"
-
-#~ msgid "Change"
-#~ msgstr "改变"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
-
 #~ msgid "MP %+d"
 #~ msgstr "MP %+d"
-
 #~ msgid "Confirm"
 #~ msgstr "确定"
-
 #~ msgid "Charisma:"
 #~ msgstr "魅力:"
-
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "总的力量：%d - 最大力量：%d"
-
 #~ msgid "Keep"
 #~ msgstr "保持"
+