Update translations.

1 files changed, 135 insertions, 119 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index df9349a5f..2ee0f2061 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: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+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"
@@ -5170,15 +5170,13 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
 msgid "Switch"
-msgstr "登录"
+msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
 msgid "Password"
-msgstr "密码:"
+msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
@@ -5222,9 +5220,8 @@ msgid "Please set new pincode"
 msgstr ""
 
 #: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
 msgid "Please enter new name"
-msgstr "请指定一个名称."
+msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
 #: src/gui/windows/charselectdialog.cpp:259
@@ -5873,7 +5870,7 @@ msgstr "显示在公布的联系"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
 msgid "Request for Trade"
 msgstr "请求交易"
 
@@ -7523,19 +7520,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
 msgid "Item sharing enabled."
 msgstr "物品共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
 msgid "Item sharing disabled."
 msgstr "物品共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
 msgid "Item sharing not possible."
 msgstr "物品共享不可能."
 
@@ -7546,19 +7543,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
 msgid "Experience sharing enabled."
 msgstr "经验共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能."
 
@@ -7684,14 +7681,12 @@ msgstr ""
 #. TRANSLATORS: char rename error
 #: src/net/eathena/charserverhandler.cpp:516
 #: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
 msgid "Character rename error."
-msgstr "角色已删除."
+msgstr ""
 
 #: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
 msgid "Character renamed."
-msgstr "角色已删除."
+msgstr ""
 
 #. TRANSLATORS: char rename error
 #: src/net/eathena/charserverhandler.cpp:544
@@ -7705,9 +7700,8 @@ msgstr ""
 
 #. TRANSLATORS: char rename error
 #: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
 msgid "Character not found."
-msgstr "角色可用点: %d"
+msgstr ""
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7771,9 +7765,8 @@ msgid "Speed hack detected."
 msgstr "检测速度劈."
 
 #: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
 msgid "Server full."
-msgstr "服务器:"
+msgstr ""
 
 #: src/net/eathena/generalhandler.cpp:182
 msgid "Sorry, you are underaged."
@@ -7845,18 +7838,16 @@ msgid "Ip limited access."
 msgstr ""
 
 #: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
 msgid "Over characters list."
-msgstr "角色已删除."
+msgstr ""
 
 #: src/net/eathena/generalhandler.cpp:238
 msgid "Ip blocked."
 msgstr ""
 
 #: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
 msgid "Invalid password count."
-msgstr "旧密码不正确."
+msgstr ""
 
 #: src/net/eathena/generalhandler.cpp:244
 msgid "Not allowed race."
@@ -8023,13 +8014,13 @@ msgid "Huh? What's that?"
 msgstr "啊？那是什么?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
 #, c-format
 msgid "Trade: You and %s"
 msgstr "交易：您和%s"
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是否接受?"
@@ -8248,429 +8239,454 @@ msgstr "无法购买."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "你没有足够的钱币."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "无法购买."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
 msgid "Nothing to sell."
 msgstr "无物可供出售."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
 msgid "Thanks for selling."
 msgstr "感谢您的出售."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
 msgid "Unable to sell."
 msgstr "无法出售."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
 msgid "Unable to sell while trading."
 msgstr "不能出售，交易."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
 msgid "Unable to sell unsellable item."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
 #, c-format
 msgid "Online users: %d"
 msgstr "在线用户数：%d"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
 msgid "Guild created."
 msgstr "帮会已创建."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
 msgid "You are already in guild."
 msgstr "您已经在公会."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
 msgid "Emperium check failed."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
 msgid "Unknown server response."
 msgstr "未知的服务器的响应."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
 msgid "You have left the guild."
 msgstr "你已经离开工会."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
 msgid "Could not invite user to guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
 msgid "User rejected guild invite."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
 msgid "User is now part of your guild."
 msgstr "用户现在是你们的工会成员了."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
 msgid "Your guild is full."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
 msgid "Unknown guild invite response."
 msgstr "未知工会邀请响应."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
 #, c-format
 msgid "%s has left your guild."
 msgstr "%s已经离开工会."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
 msgid "You were kicked from guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s已经被工会开除."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
 msgid "Failed to use item."
 msgstr "使用物品失败."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
 msgid "Unable to equip."
 msgstr "无法装备."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
 msgid "Could not create party."
 msgstr "无法创建帮会."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
 msgid "Party successfully created."
 msgstr "帮会创建成功."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
 msgid "You have left the party."
 msgstr "你以退出帮会."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
 msgid "You cant left party on this map."
-msgstr "你以退出帮会."
+msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
 msgid "You was kicked from party."
-msgstr "踢从党"
+msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s已经加入你的党."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s已经是你的帮会成员了."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s拒绝了您的邀请."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s现在是你帮会中的成员了."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s不能加入团队，因为团队成员已满."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已经离开你的帮会."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
 msgid "%s cant be kicked from party on this map."
-msgstr "%s已经被工会开除."
+msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
 msgid "%s has kicked from your party."
-msgstr "%s已经被工会开除."
+msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知成员尝试说：%s"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s不在你的帮会中!"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
 #, c-format
 msgid "You picked up %s."
 msgstr "你捡起了%s."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
 #, c-format
 msgid "You spent %s."
 msgstr "你花费 %s."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
 msgid "Cannot raise skill!"
 msgstr "不能提升技能!"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
 msgid "Equip ammunition first."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
 #, c-format
 msgid "Trading with %s isn't possible. Character doesn't exist."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
 msgid "Trade cancelled due to an unknown reason."
 msgstr "交易取消因不明原因."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "与%s的交易被取消."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "与%s的交易被取消."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
 #, c-format
 msgid "Unhandled trade cancel packet with %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "添加项目失败。交易伙伴已经负重太多."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "添加项目失败。交易伙伴无空闲槽存放物品."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
 msgid "Failed adding item. You can't trade this item."
 msgstr "添加物品失败。您不能交易这项物品."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
 msgid "Failed adding item for unknown reason."
 msgstr "添加项目失败，原因未知."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
 msgid "Trade canceled."
 msgstr "交易取消."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
 msgid "Trade completed."
 msgstr "交易完成."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
 msgid "Kick failed!"
 msgstr "踢出失败!"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
 msgid "Kick succeeded!"
 msgstr "成功踢出!"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
 #, c-format
 msgid "MVP player: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
 msgid "All whispers ignored."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
 msgid "All whispers ignore failed."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
 msgid "All whispers unignored."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
 msgid "All whispers unignore failed."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
 msgid "pvp off, gvg off"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
 msgid "pvp on"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
 msgid "gvg on"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
 msgid "pvp on, gvg on"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
 msgid "unknown pvp"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
 #, c-format
 msgid "Char from account %s is already in your party!"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
 #, c-format
 msgid "%s blocked invite!"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
 msgid "Char is not online!"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
 msgid "Pet catch failed."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
 msgid "Pet catched."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
 #, c-format
 msgid "Pet catch unkown error: %d."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
 msgid "Your mercenary duty hour is over."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
 msgid "Your mercenary was killed."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
 msgid "Your mercenary was fired."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
 msgid "Your mercenary run away."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
 msgid "Mercenary unknown state."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
 msgid "You feed your homunculus."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
 #, c-format
 msgid "You cant feed homunculus, because not have %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
 msgid "Card insert failed."
-msgstr "交易失败!"
+msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
 msgid "Card inserted."
 msgstr ""