1 files changed, 57 insertions, 61 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5aefe6469..cea42a637 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-06 02:00+0300\n"
-"PO-Revision-Date: 2015-03-28 11:07+0000\n"
+"POT-Creation-Date: 2015-04-11 12:51+0300\n"
+"PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -312,21 +312,21 @@ msgstr "在地图上可见"
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:575
+#: src/being/being.cpp:578
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:575
+#: src/being/being.cpp:578
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1921 src/gui/windows/whoisonline.cpp:865
+#: src/being/being.cpp:1942 src/gui/windows/whoisonline.cpp:865
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1926 src/gui/windows/whoisonline.cpp:870
+#: src/being/being.cpp:1947 src/gui/windows/whoisonline.cpp:870
 msgid "I"
 msgstr "I"
 
@@ -404,42 +404,40 @@ msgstr ""
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1102
-#, fuzzy
 msgid "hp"
-msgstr "商店"
+msgstr ""
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1111
-#, fuzzy
 msgid "mana"
-msgstr "法力栏"
+msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:2183
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2186 src/being/localplayer.cpp:2211
+#: src/being/localplayer.cpp:2189 src/being/localplayer.cpp:2214
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2196
+#: src/being/localplayer.cpp:2199
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2202 src/being/localplayer.cpp:2216
+#: src/being/localplayer.cpp:2205 src/being/localplayer.cpp:2219
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2566
+#: src/being/localplayer.cpp:2569
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -662,7 +660,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2138
 msgid "General"
 msgstr "常规"
 
@@ -1626,7 +1624,7 @@ msgstr "交易"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:803 src/gui/widgets/skillinfo.cpp:114
+#: src/gui/popups/popupmenu.cpp:803 src/gui/widgets/skillinfo.cpp:116
 #: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:358
 msgid "Attack"
@@ -2109,7 +2107,7 @@ msgstr "检索所有"
 #: src/gui/windows/inventorywindow.cpp:184
 #: src/gui/windows/inventorywindow.cpp:750 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
-#: src/gui/windows/skilldialog.cpp:477 src/gui/windows/skilldialog.cpp:559
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
@@ -2724,7 +2722,7 @@ msgstr "最大"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:602
+#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
@@ -2738,59 +2736,59 @@ msgstr "编辑"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:473
+#: src/gui/widgets/skillinfo.cpp:102 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:104
+#: src/gui/widgets/skillinfo.cpp:106
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:623
+#: src/gui/widgets/skillinfo.cpp:111 src/gui/windows/equipmentwindow.cpp:623
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:121
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:126
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:131
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:136
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:139
+#: src/gui/widgets/skillinfo.cpp:141
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:143
+#: src/gui/widgets/skillinfo.cpp:145
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:149
+#: src/gui/widgets/skillinfo.cpp:151
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:155
+#: src/gui/widgets/skillinfo.cpp:157
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -5938,12 +5936,12 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:69
+#: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:71
+#: src/gui/windows/npcselldialog.cpp:69
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6158,7 +6156,7 @@ msgstr ""
 msgid "Skill %d"
 msgstr "技能为%d"
 
-#: src/gui/windows/skilldialog.cpp:478
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -8354,52 +8352,52 @@ msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:377 src/net/tmwa/skillhandler.cpp:223
+#: src/net/eathena/skillhandler.cpp:377 src/net/tmwa/skillhandler.cpp:222
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:381 src/net/tmwa/skillhandler.cpp:227
+#: src/net/eathena/skillhandler.cpp:381 src/net/tmwa/skillhandler.cpp:226
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:385 src/net/tmwa/skillhandler.cpp:231
+#: src/net/eathena/skillhandler.cpp:385 src/net/tmwa/skillhandler.cpp:230
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:389 src/net/tmwa/skillhandler.cpp:235
+#: src/net/eathena/skillhandler.cpp:389 src/net/tmwa/skillhandler.cpp:234
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:393 src/net/tmwa/skillhandler.cpp:239
+#: src/net/eathena/skillhandler.cpp:393 src/net/tmwa/skillhandler.cpp:238
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:397 src/net/tmwa/skillhandler.cpp:243
+#: src/net/eathena/skillhandler.cpp:397 src/net/tmwa/skillhandler.cpp:242
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:401 src/net/tmwa/skillhandler.cpp:247
+#: src/net/eathena/skillhandler.cpp:401 src/net/tmwa/skillhandler.cpp:246
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:406 src/net/tmwa/skillhandler.cpp:252
+#: src/net/eathena/skillhandler.cpp:406 src/net/tmwa/skillhandler.cpp:251
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:410 src/net/tmwa/skillhandler.cpp:256
+#: src/net/eathena/skillhandler.cpp:410 src/net/tmwa/skillhandler.cpp:255
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:414 src/net/tmwa/skillhandler.cpp:260
+#: src/net/eathena/skillhandler.cpp:414 src/net/tmwa/skillhandler.cpp:259
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到!"
 
@@ -8461,52 +8459,52 @@ msgid "New password too short."
 msgstr "新密码太短."
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillhandler.cpp:190
+#: src/net/tmwa/skillhandler.cpp:189
 msgid "Trade failed!"
 msgstr "交易失败!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillhandler.cpp:194
+#: src/net/tmwa/skillhandler.cpp:193
 msgid "Emote failed!"
 msgstr "发送表情失败!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillhandler.cpp:198
+#: src/net/tmwa/skillhandler.cpp:197
 msgid "Sit failed!"
 msgstr "原地休息失败!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillhandler.cpp:202
+#: src/net/tmwa/skillhandler.cpp:201
 msgid "Chat creating failed!"
 msgstr "聊天创建失败!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillhandler.cpp:206
+#: src/net/tmwa/skillhandler.cpp:205
 msgid "Could not join party!"
 msgstr "不能加入工会!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillhandler.cpp:210
+#: src/net/tmwa/skillhandler.cpp:209
 msgid "Cannot shout!"
 msgstr "无法呼喊!"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillhandler.cpp:264
+#: src/net/tmwa/skillhandler.cpp:263
 msgid "Huh? What's that?"
 msgstr "啊？那是什么?"
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillhandler.cpp:275
+#: src/net/tmwa/skillhandler.cpp:274
 msgid "Warp failed..."
 msgstr "传送失败..."
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillhandler.cpp:279
+#: src/net/tmwa/skillhandler.cpp:278
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
 #. TRANSLATORS: error message
-#: src/net/tmwa/skillhandler.cpp:283
+#: src/net/tmwa/skillhandler.cpp:282
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
@@ -9233,9 +9231,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:524
-#, fuzzy, c-format
+#, c-format
 msgid "%s joined room."
-msgstr "%s已经加入你的党."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:528
@@ -9245,9 +9243,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:532
-#, fuzzy, c-format
+#, c-format
 msgid "%s kicked from room."
-msgstr "%s已经被工会开除."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:536
@@ -9262,9 +9260,8 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:544
-#, fuzzy
 msgid "Room join failed. Wrong password."
-msgstr "错误的密码."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:548
@@ -9273,9 +9270,8 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:552
-#, fuzzy
 msgid "Room join failed. Not enought money."
-msgstr "你没有足够的钱币."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556