Updated po files (not really needed yet, but the da file needed fixing)

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 199 insertions, 162 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4638cfbe..8c96404d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:51-0700\n"
+"POT-Creation-Date: 2009-01-28 09:34-0700\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."
@@ -33,7 +33,7 @@ msgstr "购买"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "价格：%d 金币/总数：%d 金币"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
 msgid "Quit"
 msgstr "退出"
 
@@ -57,30 +57,30 @@ msgstr "商店"
 msgid "Sell"
 msgstr "出售"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
-#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
+#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/gui/char_select.cpp:62
+#: ../src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "确认删除角色"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色？"
 
-#: ../src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:82
 msgid "Select Character"
 msgstr "选择角色"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
-#: ../src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
+#: ../src/gui/char_select.cpp:188
 #, c-format
 msgid "Name: %s"
 msgstr "姓名：%s"
@@ -90,68 +90,70 @@ msgstr "姓名：%s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
-#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190
 #, c-format
 msgid "Job Level: %d"
 msgstr "职业等级：%d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
 #, c-format
 msgid "Money: %d"
 msgstr "金钱：%d"
 
-#: ../src/gui/char_select.cpp:93
-msgid "Previous"
-msgstr "上一个"
-
-#: ../src/gui/char_select.cpp:94
-msgid "Next"
-msgstr "下一个"
-
-#: ../src/gui/char_select.cpp:95
+#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:192
 msgid "New"
 msgstr "新建"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/char_select.cpp:98
+msgid "Previous"
+msgstr "上一个"
+
+#: ../src/gui/char_select.cpp:99
+msgid "Next"
+msgstr "下一个"
+
+#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
 #: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "确认"
 
-#: ../src/gui/char_select.cpp:176
+#: ../src/gui/char_select.cpp:179
 #, c-format
 msgid "Gold: %d"
 msgstr "金币：%d"
 
-#: ../src/gui/char_select.cpp:247
+#: ../src/gui/char_select.cpp:248
 msgid "Create Character"
 msgstr "创建角色"
 
-#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "姓名："
 
-#: ../src/gui/char_select.cpp:260
+#: ../src/gui/char_select.cpp:261
 msgid "Hair Color:"
 msgstr "发色："
 
-#: ../src/gui/char_select.cpp:263
+#: ../src/gui/char_select.cpp:264
 msgid "Hair Style:"
 msgstr "发型："
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Create"
 msgstr "建立"
 
@@ -160,7 +162,7 @@ msgid "Select Server"
 msgstr "选择服务器"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
 #: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr "确定"
@@ -185,323 +187,323 @@ msgstr "%s 全局公告："
 msgid "Server:"
 msgstr "服务器："
 
-#: ../src/gui/chat.cpp:327
+#: ../src/gui/chat.cpp:333
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s窃窃私语：%s"
 
-#: ../src/gui/chat.cpp:346
+#: ../src/gui/chat.cpp:352
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:479
+#: ../src/gui/chat.cpp:485
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:480
+#: ../src/gui/chat.cpp:486
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:490
+#: ../src/gui/chat.cpp:496
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:498
+#: ../src/gui/chat.cpp:504
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:503
+#: ../src/gui/chat.cpp:509
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:516
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:556
+#: ../src/gui/chat.cpp:562
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:565
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
+#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:601
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:610
 msgid "Unknown command"
 msgstr "未知指令"
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:622
 msgid "Trade failed!"
 msgstr "交易失败！"
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:625
 msgid "Emote failed!"
 msgstr "发送表情失败！"
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:628
 msgid "Sit failed!"
 msgstr "原地休息失败！"
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:631
 msgid "Chat creating failed!"
 msgstr "聊天创建失败！"
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:634
 msgid "Could not join party!"
 msgstr "不能加入工会！"
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:637
 msgid "Cannot shout!"
 msgstr "无法呼喊！"
 
-#: ../src/gui/chat.cpp:640
+#: ../src/gui/chat.cpp:646
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级！"
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:649
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:652
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:655
 msgid "You have no memos!"
 msgstr "没有备忘录"
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:658
 #, fuzzy
 msgid "You cannot do that right now!"
 msgstr "你现在无法办到！"
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:661
 msgid "Seems you need more Zeny... ;-)"
 msgstr "你需要更多钞票……;-)"
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:664
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能！"
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:667
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石！"
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:670
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石！"
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:673
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到！"
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:676
 msgid "Huh? What's that?"
 msgstr "啊？那是什么？"
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:685
 msgid "Warp failed..."
 msgstr "传送失败..."
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:688
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:691
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:774
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:779
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:785
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:790
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "改变成OpenGL"
 
-#: ../src/gui/chat.cpp:794
+#: ../src/gui/chat.cpp:800
 msgid "-- Help --"
 msgstr "-- 帮助 --"
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:803
 msgid "/announce: Global announcement (GM only)"
 msgstr "/announce: 全局通告（只有GM可使用）"
 
-#: ../src/gui/chat.cpp:798
+#: ../src/gui/chat.cpp:804
 msgid "/clear: Clears this window"
 msgstr "/clear: 清除聊天记录"
 
-#: ../src/gui/chat.cpp:799
+#: ../src/gui/chat.cpp:805
 msgid "/help: Display this help"
 msgstr "/help: 显示帮助信息"
 
-#: ../src/gui/chat.cpp:801
+#: ../src/gui/chat.cpp:807
 #, fuzzy
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr "/w <昵称> <信息>: /whisper的缩写形式"
 
-#: ../src/gui/chat.cpp:802
+#: ../src/gui/chat.cpp:808
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:810
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:806
+#: ../src/gui/chat.cpp:812
 msgid "/where: Display map name"
 msgstr "/where: 显示地图名称"
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:813
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr "/w <昵称> <信息>: /whisper的缩写形式"
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:814
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr "/whisper <昵称> <信息>： 发送一条私密信息 <信息> 给 <昵称>"
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:816
 msgid "/who: Display number of online users"
 msgstr "/who: 显示在线用户数"
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:817
 msgid "For more information, type /help <command>"
 msgstr "输入/help <指令> 获取更多帮助信息"
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:821
 msgid "Command: /announce <msg>"
 msgstr "指令： /announce <信息>"
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:822
 msgid "*** only available to a GM ***"
 msgstr "*** 只有GM可用 ***"
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:823
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "该指令会发送<信息>给所有在线用户。"
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:828
 msgid "Command: /clear"
 msgstr "指令： /clear"
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:829
 msgid "This command clears the chat log of previous chat."
 msgstr "该指令可清除历史聊天记录。"
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:834
 msgid "Command: /help"
 msgstr "指令： /help"
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:835
 msgid "This command displays a list of all commands available."
 msgstr "该指令可显示所有可用指令。"
 
-#: ../src/gui/chat.cpp:831
+#: ../src/gui/chat.cpp:837
 msgid "Command: /help <command>"
 msgstr "指令： /help <指令>"
 
-#: ../src/gui/chat.cpp:832
+#: ../src/gui/chat.cpp:838
 msgid "This command displays help on <command>."
 msgstr "该指令显现<指令>的帮助信息"
 
-#: ../src/gui/chat.cpp:840
+#: ../src/gui/chat.cpp:846
 #, fuzzy
 msgid "Command: /present"
 msgstr "指令: /where"
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:847
 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/gui/chat.cpp:851
+#: ../src/gui/chat.cpp:857
 #, fuzzy
 msgid "Command: /toggle <state>"
 msgstr "指令： /announce <信息>"
 
-#: ../src/gui/chat.cpp:852
+#: ../src/gui/chat.cpp:858
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:855
+#: ../src/gui/chat.cpp:861
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:864
 #, fuzzy
 msgid "Command: /toggle"
 msgstr "指令： /clear"
 
-#: ../src/gui/chat.cpp:859
+#: ../src/gui/chat.cpp:865
 #, fuzzy
 msgid "This command displays the return toggle status."
 msgstr "该条指令显示当前地图名。"
 
-#: ../src/gui/chat.cpp:863
+#: ../src/gui/chat.cpp:869
 msgid "Command: /where"
 msgstr "指令: /where"
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:870
 msgid "This command displays the name of the current map."
 msgstr "该条指令显示当前地图名。"
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:875
 #, fuzzy
 msgid "Command: /msg <nick> <msg>"
 msgstr "指令： /w <昵称> <信息>"
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:876
 msgid "Command: /whisper <nick> <msg>"
 msgstr "指令： /whisper <昵称> <信息>"
 
-#: ../src/gui/chat.cpp:871
+#: ../src/gui/chat.cpp:877
 msgid "Command: /w <nick> <msg>"
 msgstr "指令： /w <昵称> <信息>"
 
-#: ../src/gui/chat.cpp:872
+#: ../src/gui/chat.cpp:878
 msgid "This command sends the message <msg> to <nick>."
 msgstr "该条指令发送信息 <msg> 给 <nick>"
 
-#: ../src/gui/chat.cpp:874
+#: ../src/gui/chat.cpp:880
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
 
-#: ../src/gui/chat.cpp:879
+#: ../src/gui/chat.cpp:885
 msgid "Command: /who"
 msgstr "指令： /who"
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:886
 msgid "This command displays the number of players currently online."
 msgstr "该条指令可显现当前在线用户总数。"
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:891
 msgid "Unknown command."
 msgstr "未知命令"
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:892
 msgid "Type /help for a list of commands."
 msgstr "输入 /help 获取指令列表。"
 
@@ -557,21 +559,27 @@ msgstr "连接中..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
+#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
-#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
+#: ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "使用"
 
-#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "装备"
 
+#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
+#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+msgid "Unequip"
+msgstr "卸下装备"
+
 #: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr "帮助"
@@ -580,33 +588,28 @@ msgstr "帮助"
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
+#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "物品栏"
 
-#: ../src/gui/inventorywindow.cpp:61
+#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
+#: ../src/gui/inventorywindow.cpp:212
+msgid "Equip"
+msgstr "装备"
+
+#: ../src/gui/inventorywindow.cpp:73
 msgid "Drop"
 msgstr "丢弃"
 
-#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
-#, fuzzy, c-format
-msgid "Weight: %d  g / %d g"
-msgstr "负重：%d / %d"
-
-#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
-#, c-format
-msgid "Slots used: %d / %d"
-msgstr "已使用槽： %d / %d"
-
-#: ../src/gui/inventorywindow.cpp:183
-msgid "Unequip"
-msgstr "卸下装备"
+#: ../src/gui/inventorywindow.cpp:85
+#, fuzzy
+msgid "Slots: "
+msgstr "技能点数：%d"
 
-#: ../src/gui/inventorywindow.cpp:185
-msgid "Equip"
-msgstr "装备"
+#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+msgid "Weight: "
+msgstr ""
 
 #: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
@@ -616,6 +619,10 @@ msgstr "请选择交易的物品数量"
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量"
 
+#: ../src/gui/itempopup.cpp:118
+msgid " grams"
+msgstr ""
+
 #: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "登录"
@@ -660,12 +667,7 @@ msgstr "快捷键"
 msgid "Setup"
 msgstr "设置"
 
-#: ../src/gui/minimap.cpp:39
-#, fuzzy
-msgid "Map"
-msgstr "小地图"
-
-#: ../src/gui/minimap.cpp:43
+#: ../src/gui/minimap.cpp:39 ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "小地图"
 
@@ -728,7 +730,7 @@ msgid "@@talk|Talk To NPC@@"
 msgstr "@@谈话|和NPC谈话@@"
 
 #: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:309
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@取消|取消@@"
 
@@ -737,29 +739,34 @@ msgstr "@@取消|取消@@"
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@捡起|捡起%s@@"
 
-#: ../src/gui/popupmenu.cpp:298
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr "@@使用|卸载@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@使用|装备@@"
 
-#: ../src/gui/popupmenu.cpp:303
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@使用|使用@@"
 
-#: ../src/gui/popupmenu.cpp:305
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@丢弃|丢弃@@"
 
-#: ../src/gui/popupmenu.cpp:306
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:307
-msgid "@@description|Description@@"
-msgstr "@@描述|描述@@"
+#: ../src/gui/recorder.h:41
+#, fuzzy
+msgid "Recording..."
+msgstr "连接中..."
+
+#: ../src/gui/recorder.h:42
+msgid "Stop recording"
+msgstr ""
 
 #: ../src/gui/register.cpp:82
 msgid "Confirm:"
@@ -819,12 +826,11 @@ msgstr "音效声量"
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60
 msgid "Apply"
 msgstr "应用"
 
-#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60
 msgid "Reset Windows"
 msgstr "重置窗口"
 
@@ -1129,6 +1135,23 @@ msgstr "职业：%d"
 msgid "Money: %d GP"
 msgstr "金钱：%d 金币"
 
+#: ../src/gui/status.cpp:53
+msgid "HP:"
+msgstr ""
+
+#: ../src/gui/status.cpp:57
+msgid "Exp:"
+msgstr ""
+
+#: ../src/gui/status.cpp:61
+msgid "MP:"
+msgstr ""
+
+#: ../src/gui/status.cpp:65
+#, fuzzy
+msgid "Job:"
+msgstr "职业：%d"
+
 #. ----------------------
 #. Stats Part
 #. ----------------------
@@ -1638,45 +1661,45 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:394
+#: ../src/game.cpp:390
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:399
+#: ../src/game.cpp:395
 #, fuzzy
 msgid "Saving screenshot failed!"
 msgstr "原地休息失败！"
 
-#: ../src/game.cpp:400
+#: ../src/game.cpp:396
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:475
+#: ../src/game.cpp:471
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:476
+#: ../src/game.cpp:472
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:539
+#: ../src/game.cpp:535
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:546
+#: ../src/game.cpp:542
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:641
+#: ../src/game.cpp:637
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "你确定想删除这个角色？"
 
-#: ../src/game.cpp:648
+#: ../src/game.cpp:644
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:788
+#: ../src/game.cpp:784
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -2017,6 +2040,20 @@ msgstr "未知命令"
 msgid "Type /help party for a list of options."
 msgstr "输入 /help 获取指令列表。"
 
+#, fuzzy
+#~ msgid "Weight: %d  g / %d g"
+#~ msgstr "负重：%d / %d"
+
+#~ msgid "Slots used: %d / %d"
+#~ msgstr "已使用槽： %d / %d"
+
+#, fuzzy
+#~ msgid "Map"
+#~ msgstr "小地图"
+
+#~ msgid "@@description|Description@@"
+#~ msgstr "@@描述|描述@@"
+
 #~ msgid "Remember Username"
 #~ msgstr "保存用户名"