1 files changed, 52 insertions, 55 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8b858395c..00abd5c31 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: 2016-03-26 13:56+0300\n"
-"PO-Revision-Date: 2016-03-10 15:47+0000\n"
+"POT-Creation-Date: 2016-04-06 02:15+0300\n"
+"PO-Revision-Date: 2016-03-27 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -60,9 +60,9 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:441 src/net/tmwa/charserverrecv.cpp:286
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "确定"
 
@@ -303,26 +303,26 @@ msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:489
+#: src/being/being.cpp:491
 msgid "Human"
 msgstr ""
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:667
+#: src/being/being.cpp:669
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:667
+#: src/being/being.cpp:669
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2261 src/gui/windows/whoisonline.cpp:881
+#: src/being/being.cpp:2263 src/gui/windows/whoisonline.cpp:881
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2266 src/gui/windows/whoisonline.cpp:886
+#: src/being/being.cpp:2268 src/gui/windows/whoisonline.cpp:886
 msgid "I"
 msgstr "I"
 
@@ -589,9 +589,9 @@ msgstr "正在更改游戏服务器"
 #: src/gui/windows/editserverdialog.cpp:210
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:351
-#: src/net/eathena/charserverrecv.cpp:355
-#: src/net/eathena/charserverrecv.cpp:437 src/net/tmwa/charserverrecv.cpp:282
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "错误"
 
@@ -2094,7 +2094,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:737
-#: src/net/eathena/skillrecv.cpp:364
+#: src/net/eathena/skillrecv.cpp:370
 msgid "Warp"
 msgstr ""
 
@@ -2866,8 +2866,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3056 src/gui/popups/popupmenu.cpp:3075
 #: src/gui/popups/popupmenu.cpp:3088 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:374
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "信息"
 
@@ -3280,7 +3280,7 @@ msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:97
+#: src/gui/widgets/itemlinkhandler.cpp:100
 msgid "Open url"
 msgstr ""
 
@@ -9016,33 +9016,33 @@ msgstr "连接到服务器终止. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:353
-#: src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:376
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:392
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:439 src/net/tmwa/charserverrecv.cpp:284
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "删除角色失败."
 
@@ -9072,22 +9072,21 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:332
+#: src/net/eathena/chatrecv.cpp:337
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:454
+#: src/net/eathena/chatrecv.cpp:459
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: adopt child message
 #: src/net/eathena/familyrecv.cpp:73
-#, fuzzy
 msgid "Request parents"
-msgstr "请求角色"
+msgstr ""
 
 #. TRANSLATORS: adopt child message
 #: src/net/eathena/familyrecv.cpp:75
@@ -9375,7 +9374,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:693
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9383,8 +9382,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:997 src/net/eathena/inventoryrecv.cpp:1130
-#: src/resources/db/itemdb.cpp:264
+#: src/net/eathena/inventoryrecv.cpp:1177
+#: src/net/eathena/inventoryrecv.cpp:1310 src/resources/db/itemdb.cpp:264
 msgid "Unknown item"
 msgstr "未知物品"
 
@@ -9416,109 +9415,108 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:232
+#: src/net/eathena/skillrecv.cpp:238
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:245
+#: src/net/eathena/skillrecv.cpp:251
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:254 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:260 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:258 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:264 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:262 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:268 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:266 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:272 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:270 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:276 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:274 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:278 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:283 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:289 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:287 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:293 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:291 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:297 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:295
+#: src/net/eathena/skillrecv.cpp:301
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:299
+#: src/net/eathena/skillrecv.cpp:305
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:309
+#: src/net/eathena/skillrecv.cpp:315
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:315
+#: src/net/eathena/skillrecv.cpp:321
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:329
+#: src/net/eathena/skillrecv.cpp:335
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:335
+#: src/net/eathena/skillrecv.cpp:341
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:344
-#, fuzzy
+#: src/net/eathena/skillrecv.cpp:350
 msgid "Skill failed!"
-msgstr "原地休息失败!"
+msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:362
+#: src/net/eathena/skillrecv.cpp:368
 msgid "Select warp target"
 msgstr ""
 
@@ -10781,9 +10779,8 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-#, fuzzy
 msgid "You was called by partner."
-msgstr "你以退出帮会."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804