summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-07-21 14:35:36 +0300
committerAndrei Karas <akaras@inbox.ru>2012-07-21 14:35:36 +0300
commitdc48ddeb149ae1a591fb179e99a4939dbe3e8f7a (patch)
tree9244756e2f32fd14f219f8ea90b830c3499269d7 /po/zh_CN.po
parentf3850f2cf7f4428eed3be0efe9a7c440b9e4d950 (diff)
downloadmv-dc48ddeb149ae1a591fb179e99a4939dbe3e8f7a.tar.gz
mv-dc48ddeb149ae1a591fb179e99a4939dbe3e8f7a.tar.bz2
mv-dc48ddeb149ae1a591fb179e99a4939dbe3e8f7a.tar.xz
mv-dc48ddeb149ae1a591fb179e99a4939dbe3e8f7a.zip
update translations.
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1060
1 files changed, 443 insertions, 617 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bd7af07f5..0ded496a4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,10 +10,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-07-07 01:18+0300\n"
-"PO-Revision-Date: 2012-06-21 20:34+0000\n"
+"POT-Creation-Date: 2012-07-21 03:25+0300\n"
+"PO-Revision-Date: 2012-07-21 00:31+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
"language/zh_CN/)\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -29,125 +29,125 @@ msgstr "忽略新进的交易请求"
msgid "Accepting incoming trade requests"
msgstr "接受传入的交易请求"
-#: src/actorspritemanager.cpp:1267
+#: src/actorspritemanager.cpp:1269
msgid "Visible on map"
msgstr "在地图上可见"
-#: src/being.cpp:345
+#: src/being.cpp:340
msgid "Human"
msgstr ""
-#: src/being.cpp:562
+#: src/being.cpp:557
msgid "dodge"
msgstr "躲闪"
-#: src/being.cpp:562
+#: src/being.cpp:557
msgid "miss"
msgstr "无法出售无法出售的物品。"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1614 src/gui/whoisonline.cpp:766
+#: src/being.cpp:1609 src/gui/whoisonline.cpp:766
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1619 src/gui/whoisonline.cpp:771
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:771
msgid "I"
msgstr "I"
-#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:106
msgid "Setup"
msgstr "魔法攻击"
-#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "性能"
-#: src/client.cpp:996 src/gui/setup_video.cpp:250
+#: src/client.cpp:993 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "视频"
-#: src/client.cpp:1001
+#: src/client.cpp:998
msgid "Themes"
msgstr "主题"
-#: src/client.cpp:1087
+#: src/client.cpp:1084
msgid "Connecting to server"
msgstr "魔法防御"
-#: src/client.cpp:1125
+#: src/client.cpp:1122
msgid "Logging in"
msgstr "尝试捡起不存在的物品。"
-#: src/client.cpp:1159
+#: src/client.cpp:1156
msgid "Entering game world"
msgstr "捡起物品发生不存在的物品。"
-#: src/client.cpp:1265
+#: src/client.cpp:1262
msgid "Requesting characters"
msgstr "请求角色"
-#: src/client.cpp:1300
+#: src/client.cpp:1297
msgid "Connecting to the game server"
msgstr "连接到游戏服务器"
-#: src/client.cpp:1310
+#: src/client.cpp:1307
msgid "Changing game servers"
msgstr "更改游戏服务器"
-#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
+#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
+#: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "错误"
-#: src/client.cpp:1371
+#: src/client.cpp:1368
msgid "Requesting registration details"
msgstr "请求注册的详细信息"
-#: src/client.cpp:1397
+#: src/client.cpp:1394
msgid "Password Change"
msgstr "密码更改"
-#: src/client.cpp:1398
+#: src/client.cpp:1395
msgid "Password changed successfully!"
msgstr "更改密码成功!"
-#: src/client.cpp:1417
+#: src/client.cpp:1414
msgid "Email Change"
msgstr "更改电子邮件"
-#: src/client.cpp:1418
+#: src/client.cpp:1415
msgid "Email changed successfully!"
msgstr "更改电子邮件成功!"
-#: src/client.cpp:1438
+#: src/client.cpp:1435
msgid "Unregister Successful"
msgstr "注销成功"
-#: src/client.cpp:1439
+#: src/client.cpp:1436
msgid "Farewell, come back any time..."
msgstr "再见,随时欢迎回来... ..."
-#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
-#: src/client.cpp:2155 src/client.cpp:2162
+#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
+#: src/client.cpp:2152 src/client.cpp:2159
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s 不存在,并且无法创建!退出。"
-#: src/client.cpp:1853
+#: src/client.cpp:1850
#, c-format
msgid "Invalid update host: %s"
msgstr "无效的更新主机: %s"
-#: src/client.cpp:1887 src/client.cpp:1893
+#: src/client.cpp:1884 src/client.cpp:1890
msgid "Error creating updates directory!"
msgstr "创建更新目录错误!"
-#: src/client.cpp:1914
+#: src/client.cpp:1911
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "错误:%s 不存在并且无法创建!退出。"
@@ -360,8 +360,8 @@ msgstr "工会:%s"
#: src/gui/beingpopup.cpp:152
#, c-format
-msgid "Pvp rank: %d"
-msgstr "Pvp等级: %d"
+msgid "Pvp rank: %u"
+msgstr ""
#: src/gui/beingpopup.cpp:163
#, c-format
@@ -377,7 +377,7 @@ msgid "Name"
msgstr "姓名"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:544
#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
@@ -389,9 +389,9 @@ msgid "Talk"
msgstr "说话"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:446 src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:622 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "移动"
@@ -399,13 +399,13 @@ msgstr "移动"
msgid "Result"
msgstr "结果"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:145
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:146
msgid "Reset"
msgstr "重置"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2119
msgid "Buy"
msgstr "购买"
@@ -422,16 +422,16 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:134
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:135
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:794
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:135
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:136
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:806
msgid "-"
msgstr "-"
@@ -443,36 +443,36 @@ msgid "Quit"
msgstr "退出"
#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:522 src/gui/statuswindow.cpp:577
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:536 src/gui/statuswindow.cpp:592
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:824
msgid "Max"
msgstr "最大"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:179 src/gui/setup_other.cpp:147
+#: src/gui/inventorywindow.cpp:178 src/gui/setup_other.cpp:147
msgid "Shop"
msgstr "商店"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "出售"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
-#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
-#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
-#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:449
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1795 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -495,13 +495,13 @@ msgstr "两次新的电子邮件地址:"
#: src/gui/changeemaildialog.cpp:132
#, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "新的电子邮件地址,需要至少%d个字符长。"
+msgid "The new email address needs to be at least %u characters long."
+msgstr ""
#: src/gui/changeemaildialog.cpp:139
#, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "新的电子邮件地址必须小于%d个字符长。"
+msgid "The new email address needs to be less than %u characters long."
+msgstr ""
#: src/gui/changeemaildialog.cpp:146
msgid "The email address entries mismatch."
@@ -512,7 +512,7 @@ msgstr "电子邮件地址不匹配。"
msgid "Change Password"
msgstr "更换密码"
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:128
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:123
#: src/gui/registerdialog.cpp:77 src/gui/unregisterdialog.cpp:56
msgid "Password:"
msgstr "密码:"
@@ -527,13 +527,13 @@ msgstr "先输入旧密码。"
#: src/gui/changepassworddialog.cpp:120
#, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "新密码需要至少%d个字符长。"
+msgid "The new password needs to be at least %u characters long."
+msgstr ""
#: src/gui/changepassworddialog.cpp:127
#, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "新密码必须小于%d个字符长。"
+msgid "The new password needs to be less than %u characters long."
+msgstr ""
#: src/gui/changepassworddialog.cpp:134
msgid "The new password entries mismatch."
@@ -543,76 +543,76 @@ msgstr "新的密码输入不匹配。"
msgid "New Character"
msgstr ""
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
-#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
+#: src/gui/charcreatedialog.cpp:109 src/gui/editserverdialog.cpp:72
+#: src/gui/logindialog.cpp:122 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "姓名"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:104 src/gui/charcreatedialog.cpp:110
-#: src/gui/charcreatedialog.cpp:115 src/gui/charcreatedialog.cpp:119
+#: src/gui/charcreatedialog.cpp:112 src/gui/charcreatedialog.cpp:118
+#: src/gui/charcreatedialog.cpp:123 src/gui/charcreatedialog.cpp:127
#: src/gui/outfitwindow.cpp:89
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:107 src/gui/charcreatedialog.cpp:111
-#: src/gui/charcreatedialog.cpp:120 src/gui/outfitwindow.cpp:88
+#: src/gui/charcreatedialog.cpp:115 src/gui/charcreatedialog.cpp:119
+#: src/gui/charcreatedialog.cpp:128 src/gui/outfitwindow.cpp:88
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:116
msgid "Hair color:"
msgstr "头发颜色:"
-#: src/gui/charcreatedialog.cpp:112
+#: src/gui/charcreatedialog.cpp:120
msgid "Hair style:"
msgstr "发型:"
-#: src/gui/charcreatedialog.cpp:114
+#: src/gui/charcreatedialog.cpp:122
msgid "^"
msgstr ""
-#: src/gui/charcreatedialog.cpp:121
+#: src/gui/charcreatedialog.cpp:129
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:627
#: src/gui/socialwindow.cpp:1197
msgid "Create"
msgstr "建立"
-#: src/gui/charcreatedialog.cpp:127 src/gui/registerdialog.cpp:99
+#: src/gui/charcreatedialog.cpp:135 src/gui/registerdialog.cpp:99
msgid "Male"
msgstr "帅哥"
-#: src/gui/charcreatedialog.cpp:128 src/gui/registerdialog.cpp:100
+#: src/gui/charcreatedialog.cpp:136 src/gui/registerdialog.cpp:100
msgid "Female"
msgstr "美女"
-#: src/gui/charcreatedialog.cpp:129 src/gui/registerdialog.cpp:103
+#: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
#: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
#: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
msgid "Other"
msgstr "其他"
-#: src/gui/charcreatedialog.cpp:149 src/gui/charcreatedialog.cpp:377
+#: src/gui/charcreatedialog.cpp:157 src/gui/charcreatedialog.cpp:386
#, c-format
msgid "Please distribute %d points"
msgstr "请分发%d点数"
-#: src/gui/charcreatedialog.cpp:282
+#: src/gui/charcreatedialog.cpp:291
msgid "Your name needs to be at least 4 characters."
msgstr "你的名字需要至少4个字符"
-#: src/gui/charcreatedialog.cpp:368
+#: src/gui/charcreatedialog.cpp:377
msgid "Character stats OK"
msgstr "角色状态可以"
-#: src/gui/charcreatedialog.cpp:382
+#: src/gui/charcreatedialog.cpp:391
#, c-format
msgid "Please remove %d points"
msgstr "请删除%d点数"
@@ -674,7 +674,7 @@ msgstr "等级 %d"
msgid "(empty)"
msgstr "()"
-#: src/gui/chatwindow.cpp:121 src/gui/inventorywindow.cpp:74
+#: src/gui/chatwindow.cpp:121 src/gui/inventorywindow.cpp:73
#: src/gui/setup_visual.cpp:102
msgid "default"
msgstr "默认"
@@ -731,9 +731,9 @@ msgstr "彩虹2"
msgid "rainbow 3"
msgstr "彩虹3"
-#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
-#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
+#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:93
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
+#: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
@@ -751,7 +751,7 @@ msgstr "聊天"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1092
+#: src/gui/chatwindow.cpp:1093
#, c-format
msgid "Whispering to %s: %s"
msgstr "对%s密语到:%s"
@@ -764,9 +764,9 @@ msgstr "是"
msgid "No"
msgstr "否"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
-#: src/gui/popupmenu.cpp:2087
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2052
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2088
msgid "Ignore"
msgstr "忽略"
@@ -930,8 +930,9 @@ msgid "Did You Know?"
msgstr "你知道吗?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:58
-#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:58
+#: src/gui/npcdialog.cpp:132 src/gui/popupmenu.cpp:502
+#: src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "关闭"
@@ -977,13 +978,13 @@ msgstr ""
msgid "Please at least type both the address and the port of the server."
msgstr ""
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:80
msgid "Equipment"
msgstr "装备"
-#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:163
+#: src/gui/inventorywindow.cpp:579 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Unequip"
msgstr "卸下装备"
@@ -991,85 +992,85 @@ msgstr "卸下装备"
msgid "Help"
msgstr "帮助"
-#: src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:74
msgid "by name"
msgstr ""
-#: src/gui/inventorywindow.cpp:76
+#: src/gui/inventorywindow.cpp:75
msgid "by id"
msgstr ""
-#: src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:76
msgid "by weight"
msgstr ""
-#: src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:77
msgid "by amount"
msgstr ""
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:78
msgid "by type"
msgstr ""
-#: src/gui/inventorywindow.cpp:116 src/gui/windowmenu.cpp:83
-#: src/inventory.cpp:251
+#: src/gui/inventorywindow.cpp:115 src/gui/windowmenu.cpp:82
+#: src/inventory.cpp:252
msgid "Inventory"
msgstr "物品栏"
-#: src/gui/inventorywindow.cpp:141
+#: src/gui/inventorywindow.cpp:140
msgid "Slots:"
msgstr "槽:"
-#: src/gui/inventorywindow.cpp:153
+#: src/gui/inventorywindow.cpp:152
msgid "Filter:"
msgstr "过滤器:"
-#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:581
+#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818
msgid "Equip"
msgstr "装备"
-#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
-#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
+#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:585
+#: src/gui/popupmenu.cpp:1665 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1766 src/gui/popupmenu.cpp:1822
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "使用"
-#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
-#: src/gui/popupmenu.cpp:1826
+#: src/gui/inventorywindow.cpp:175 src/gui/inventorywindow.cpp:681
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop..."
msgstr "掉落... ..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:176 src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1836
msgid "Split"
msgstr "分离"
-#: src/gui/inventorywindow.cpp:178 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
+#: src/gui/inventorywindow.cpp:177 src/gui/outfitwindow.cpp:64
+#: src/gui/popupmenu.cpp:461 src/gui/setupactiondata.h:1546
msgid "Outfits"
msgstr "套装"
-#: src/gui/inventorywindow.cpp:181
+#: src/gui/inventorywindow.cpp:180
msgid "Weight:"
msgstr "重量:"
-#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:672
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1839 src/gui/setup.cpp:74
msgid "Store"
msgstr "存储"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1686
msgid "Retrieve"
msgstr "取回"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
-#: src/gui/windowmenu.cpp:104
+#: src/gui/inventorywindow.cpp:683 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1832
+#: src/gui/windowmenu.cpp:103
msgid "Drop"
msgstr "丢弃"
@@ -1118,7 +1119,7 @@ msgstr ","
msgid "Weight: %s"
msgstr "重量:%s"
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:75
msgid "Kill stats"
msgstr "杀敌统计"
@@ -1147,34 +1148,34 @@ msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:463
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
-#: src/gui/killstats.cpp:461
+#: src/gui/killstats.cpp:464
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
-#: src/gui/killstats.cpp:463
+#: src/gui/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
-#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:468
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:327
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1190,25 +1191,25 @@ msgstr[0] ""
msgid "Last kill exp:"
msgstr "最后EXP:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:377
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:334 src/gui/killstats.cpp:342
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:366
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:372
msgid "jacko spawning"
msgstr ""
@@ -1216,89 +1217,100 @@ msgstr ""
msgid "You have left the guild."
msgstr "你已经离开工会."
-#: src/gui/logindialog.cpp:62
+#: src/gui/logindialog.cpp:57
msgid "Normal"
msgstr "正常"
-#: src/gui/logindialog.cpp:63
+#: src/gui/logindialog.cpp:58
msgid "Auto Close"
msgstr "自动关闭"
-#: src/gui/logindialog.cpp:64
+#: src/gui/logindialog.cpp:59
msgid "Skip"
msgstr "跳过"
-#: src/gui/logindialog.cpp:119 src/gui/logindialog.cpp:174
+#: src/gui/logindialog.cpp:114 src/gui/logindialog.cpp:169
msgid "Login"
msgstr "登录"
-#: src/gui/logindialog.cpp:124 src/gui/widgets/chattab.cpp:174
+#: src/gui/logindialog.cpp:119 src/gui/widgets/chattab.cpp:174
msgid "Server:"
msgstr "服务器:"
-#: src/gui/logindialog.cpp:131
+#: src/gui/logindialog.cpp:126
#, c-format
msgid "Update host: %s"
msgstr ""
-#: src/gui/logindialog.cpp:147
+#: src/gui/logindialog.cpp:142
msgid "Custom update host"
msgstr "自定义更新主机"
-#: src/gui/logindialog.cpp:161
+#: src/gui/logindialog.cpp:156
msgid "Remember username"
msgstr "记住用户名"
-#: src/gui/logindialog.cpp:162
+#: src/gui/logindialog.cpp:157
msgid "Update:"
msgstr "更新日期:"
-#: src/gui/logindialog.cpp:172 src/gui/registerdialog.cpp:66
+#: src/gui/logindialog.cpp:167 src/gui/registerdialog.cpp:66
#: src/gui/registerdialog.cpp:82
msgid "Register"
msgstr "注册"
-#: src/gui/logindialog.cpp:173
+#: src/gui/logindialog.cpp:168
msgid "Change Server"
msgstr "更改服务器"
-#: src/gui/ministatuswindow.cpp:59
+#: src/gui/ministatuswindow.cpp:60
msgid "health bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:65
+#: src/gui/ministatuswindow.cpp:66
msgid "mana bar"
msgstr "法力栏"
-#: src/gui/ministatuswindow.cpp:77
+#: src/gui/ministatuswindow.cpp:78
msgid "experience bar"
msgstr "经验条"
-#: src/gui/ministatuswindow.cpp:83
+#: src/gui/ministatuswindow.cpp:84
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:92
+#: src/gui/ministatuswindow.cpp:93
msgid "weight bar"
msgstr "重量栏"
-#: src/gui/ministatuswindow.cpp:95
+#: src/gui/ministatuswindow.cpp:96
msgid "inventory slots bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:98
+#: src/gui/ministatuswindow.cpp:99
msgid "money bar"
msgstr "钱栏"
-#: src/gui/ministatuswindow.cpp:101
+#: src/gui/ministatuswindow.cpp:102
msgid "arrows bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:104
+#: src/gui/ministatuswindow.cpp:105
msgid "status bar"
msgstr "状态栏"
-#: src/gui/ministatuswindow.cpp:299 src/gui/ministatuswindow.cpp:339
+#: src/gui/ministatuswindow.cpp:300 src/gui/statuswindow.cpp:275
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr "级别:%d (GM %d)"
+
+#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:281 src/gui/statuswindow.cpp:347
+#, c-format
+msgid "Level: %d"
+msgstr "等级:%d"
+
+#: src/gui/ministatuswindow.cpp:322 src/gui/ministatuswindow.cpp:358
msgid "Need"
msgstr "需要"
@@ -1319,7 +1331,7 @@ msgstr "提交"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:128 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:128 src/gui/popupmenu.cpp:504
msgid "Clear"
msgstr "清除"
@@ -1335,13 +1347,13 @@ msgstr "发送"
msgid "Failed to send as sender or letter invalid."
msgstr "发送信件失败或者信件无效。"
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:534
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
#, c-format
msgid "Outfit: %d"
msgstr "套装: %d"
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:536
-#: src/gui/windowmenu.cpp:321
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/windowmenu.cpp:285
#, c-format
msgid "Key: %s"
msgstr "按键:%s"
@@ -1354,31 +1366,31 @@ msgstr ""
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:543
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "交易"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "密语"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:548
msgid "Heal"
msgstr "愈合"
#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:588
msgid "Kick from guild"
msgstr "踢从公会"
#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:593
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:602
msgid "Invite to guild"
msgstr ""
@@ -1390,8 +1402,8 @@ msgstr "踢球员"
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2160
msgid "Add comment"
msgstr "发表评论"
@@ -1411,11 +1423,11 @@ msgstr "优先攻击列表"
msgid "Add to attack list"
msgstr "加入攻击清单"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2175
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:364
msgid "Add name to chat"
msgstr ""
@@ -1423,273 +1435,270 @@ msgstr ""
msgid "Players"
msgstr "玩家"
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:571
+#: src/gui/popupmenu.cpp:2150
msgid "Kick from party"
msgstr "踢从党"
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
msgid "Pick up"
msgstr "拾取"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1784 src/gui/popupmenu.cpp:1840
msgid "Add to chat"
msgstr "加入聊天"
-#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:442
msgid "Map Item"
msgstr "地图项"
-#: src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:421
msgid "Rename"
msgstr "重命名"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
-#: src/gui/popupmenu.cpp:2002
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:2003
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:445
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:447
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:462
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
+#: src/gui/popupmenu.cpp:481 src/gui/windowmenu.cpp:102
msgid "Spells"
msgstr "法术"
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:482
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:507
+#: src/gui/popupmenu.cpp:508
msgid "Disable highlight"
msgstr "禁用"
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:510
msgid "Enable highlight"
msgstr "启用突出"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:512
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:514
msgid "Remove name"
msgstr "移除姓名"
-#: src/gui/popupmenu.cpp:515
+#: src/gui/popupmenu.cpp:516
msgid "Enable away"
msgstr "启用远"
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:518
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
msgid "Leave"
msgstr "留下"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:526
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:2148
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:637
+#: src/gui/popupmenu.cpp:638
msgid "Change guild position"
msgstr "更改公会的立场"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1147
+#: src/gui/popupmenu.cpp:1148
msgid "Rename map sign "
msgstr "重命名的地图标志"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1149
+#: src/gui/popupmenu.cpp:1150
msgid "Name: "
msgstr "名称:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1171
+#: src/gui/popupmenu.cpp:1172
msgid "Player comment "
msgstr "玩家评论"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1173
+#: src/gui/popupmenu.cpp:1174
msgid "Comment: "
msgstr "评论:"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1636
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1636
-#, fuzzy
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all-1"
-msgstr "加入攻击清单"
+msgstr ""
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1638
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1647
+#: src/gui/popupmenu.cpp:1648
msgid "Store 10"
msgstr "商店10"
-#: src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1649
msgid "Store half"
msgstr "商店的一半"
-#: src/gui/popupmenu.cpp:1649
-#, fuzzy
+#: src/gui/popupmenu.cpp:1650
msgid "Store all-1"
-msgstr "商店所有"
+msgstr ""
-#: src/gui/popupmenu.cpp:1650
+#: src/gui/popupmenu.cpp:1651
msgid "Store all"
msgstr "商店所有"
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1671 src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1828
msgid "Drop all"
msgstr "所有"
-#: src/gui/popupmenu.cpp:1689
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve 10"
msgstr "拿出10"
-#: src/gui/popupmenu.cpp:1690
+#: src/gui/popupmenu.cpp:1691
msgid "Retrieve half"
msgstr "拿出一半"
-#: src/gui/popupmenu.cpp:1691
-#, fuzzy
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all-1"
-msgstr "检索所有"
+msgstr ""
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1693
msgid "Retrieve all"
msgstr "检索所有"
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1849
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1914
msgid "Hide"
msgstr "隐藏"
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1883 src/gui/popupmenu.cpp:1920
msgid "Show"
msgstr "显示"
-#: src/gui/popupmenu.cpp:1925
+#: src/gui/popupmenu.cpp:1926
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1928 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(默认)"
-#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1958 src/gui/popupmenu.cpp:1968
msgid "Move up"
msgstr "x"
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1970
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2159
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2050
msgid "Be friend"
msgstr "是朋友"
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
-#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
-#: src/gui/popupmenu.cpp:2094
+#: src/gui/popupmenu.cpp:2051 src/gui/popupmenu.cpp:2059
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2095
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
-#: src/gui/popupmenu.cpp:2088
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2089
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
-#: src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
-#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
-#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2077
+#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2090
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
-#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2076 src/gui/popupmenu.cpp:2096
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "完全忽略"
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2106
msgid "Follow"
msgstr "按照"
-#: src/gui/popupmenu.cpp:2106
+#: src/gui/popupmenu.cpp:2107
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Buy (?)"
msgstr "购买(?)"
-#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2137
msgid "Sell (?)"
msgstr "出售(?)"
-#: src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2158
msgid "Show Items"
msgstr "显示项目"
-#: src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2169
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2172
+#: src/gui/popupmenu.cpp:2173
msgid "Add to pickup list"
msgstr ""
@@ -1711,23 +1720,23 @@ msgstr "电子邮件"
#: src/gui/registerdialog.cpp:187
#, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "用户名至少需要%d个字符。"
+msgid "The username needs to be at least %u characters long."
+msgstr ""
#: src/gui/registerdialog.cpp:195
#, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "用户名不能少于%d个字符"
+msgid "The username needs to be less than %u characters long."
+msgstr ""
#: src/gui/registerdialog.cpp:203 src/gui/unregisterdialog.cpp:121
#, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "密码需要至少%d个字符"
+msgid "The password needs to be at least %u characters long."
+msgstr ""
#: src/gui/registerdialog.cpp:211 src/gui/unregisterdialog.cpp:128
#, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "密码不能少于%d个字符。"
+msgid "The password needs to be less than %u characters long."
+msgstr ""
#: src/gui/registerdialog.cpp:218
msgid "Passwords do not match."
@@ -2315,7 +2324,7 @@ msgstr ""
msgid "Basic"
msgstr ""
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:100
msgid "Shortcuts"
msgstr ""
@@ -3098,38 +3107,32 @@ msgid "Medium (12)"
msgstr "中 (12)"
#: src/gui/setup_theme.cpp:88
-#, fuzzy
msgid "Normal (13)"
-msgstr "正常"
+msgstr ""
#: src/gui/setup_theme.cpp:89
-#, fuzzy
msgid "Large (14)"
-msgstr "大 (13)"
+msgstr ""
#: src/gui/setup_theme.cpp:90
-#, fuzzy
msgid "Very large (15)"
-msgstr "大 (13)"
+msgstr ""
#: src/gui/setup_theme.cpp:91
-#, fuzzy
msgid "Big (16)"
-msgstr "大(14)"
+msgstr ""
#: src/gui/setup_theme.cpp:92
msgid "Very big (17)"
msgstr ""
#: src/gui/setup_theme.cpp:93
-#, fuzzy
msgid "Huge (18)"
-msgstr "巨大的 (15)"
+msgstr ""
#: src/gui/setup_theme.cpp:94
-#, fuzzy
msgid "Very huge (19)"
-msgstr "巨大的 (15)"
+msgstr ""
#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
@@ -3228,9 +3231,8 @@ msgid "Font size"
msgstr "字体大小"
#: src/gui/setup_theme.cpp:225
-#, fuzzy
msgid "Npc font size"
-msgstr "字体大小"
+msgstr ""
#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
@@ -3470,16 +3472,16 @@ msgstr "显示在公布的联系"
msgid "Auction"
msgstr "拍卖"
-#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
msgid "Request for Trade"
msgstr "请求交易"
-#: src/gui/shopwindow.cpp:762
+#: src/gui/shopwindow.cpp:766
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s想要%s %s 你接受吗?"
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:87
msgid "Skills"
msgstr "技能"
@@ -3515,12 +3517,12 @@ msgstr "技能为%d"
msgid "Skill: %s, Id: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:506 src/gui/skilldialog.cpp:594
+#: src/gui/skilldialog.cpp:506 src/gui/skilldialog.cpp:597
#, c-format
msgid "Lvl: %d"
msgstr "等级: %d"
-#: src/gui/skilldialog.cpp:586
+#: src/gui/skilldialog.cpp:589
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "等级: %d(%+d)"
@@ -3633,7 +3635,7 @@ msgstr "创建帮会"
msgid "Create Party"
msgstr "建立"
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:99
msgid "Social"
msgstr ""
@@ -3741,18 +3743,12 @@ msgstr ""
msgid "Choose your party's name."
msgstr "选择n的名称。"
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:94
msgid "Specials"
msgstr "特价商品"
-#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
-#: src/gui/statuswindow.cpp:343
-#, c-format
-msgid "Level: %d"
-msgstr "等级:%d"
-
#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:314
#, c-format
msgid "Money: %s"
msgstr "金币: %s"
@@ -3769,7 +3765,7 @@ msgstr "经验:"
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:401
#, c-format
msgid "Job: %d"
msgstr "职业:%d"
@@ -3778,17 +3774,12 @@ msgstr "职业:%d"
msgid "Job:"
msgstr "职业:"
-#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:321
#, c-format
msgid "Character points: %d"
msgstr "角色可用点: %d"
-#: src/gui/statuswindow.cpp:275
-#, c-format
-msgid "Level: %d (GM %d)"
-msgstr "级别:%d (GM %d)"
-
-#: src/gui/statuswindow.cpp:331
+#: src/gui/statuswindow.cpp:335
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -3939,21 +3930,21 @@ msgstr "连接中..."
msgid "Play"
msgstr "开始"
-#: src/gui/updaterwindow.cpp:633
+#: src/gui/updaterwindow.cpp:634
msgid "##1 The update process is incomplete."
msgstr "##1 更新过程不完整。"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:635
+#: src/gui/updaterwindow.cpp:636
msgid "##1 It is strongly recommended that"
msgstr "##1 强烈建议"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:637
+#: src/gui/updaterwindow.cpp:638
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:813
+#: src/gui/updaterwindow.cpp:814
msgid "Completed"
msgstr "已完成"
@@ -4300,79 +4291,79 @@ msgstr "命令: /unignore <玩家>"
msgid "This command stops ignoring the other player if they are being ignored."
msgstr "此命令将停止忽视了其他的球员,如果他们被忽略了。"
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:71
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:71
msgid "Bot checker"
msgstr "挂机检查"
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
msgid "Who is online"
msgstr "谁在线"
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:75
msgid "KS"
msgstr ""
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
msgid "Smilies"
msgstr "表情符号"
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
msgid "Status"
msgstr "状态"
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:80
msgid "EQU"
msgstr ""
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
msgid "INV"
msgstr ""
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:87
msgid "SKI"
msgstr ""
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:94
msgid "SPE"
msgstr ""
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:99
msgid "SOC"
msgstr ""
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:100
msgid "SH"
msgstr ""
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:102
msgid "SP"
msgstr ""
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:103
msgid "DR"
msgstr ""
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:104
msgid "YK"
msgstr "YK"
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:104
msgid "Did you know"
msgstr "你知道吗"
-#: src/gui/windowmenu.cpp:107
+#: src/gui/windowmenu.cpp:106
msgid "SET"
msgstr "SET"
@@ -4414,349 +4405,353 @@ msgstr ""
msgid "u key"
msgstr ""
-#: src/inventory.cpp:253
+#: src/inventory.cpp:254
msgid "Storage"
msgstr "仓库"
-#: src/inventory.cpp:255
+#: src/inventory.cpp:256
msgid "Cart"
msgstr ""
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:382
#, c-format
msgid "You were killed by %s"
msgstr ""
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1435
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "项目是太重了。"
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1441
msgid "Item is too far away."
msgstr "物品太远了。"
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1444
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1447
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1450
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1453
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1477
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "你拾起%d[@@%d|%s @@]。"
-#: src/localplayer.cpp:1684 src/localplayer.cpp:1718 src/localplayer.cpp:1719
+#: src/localplayer.cpp:1681 src/localplayer.cpp:1715 src/localplayer.cpp:1716
msgid "xp"
msgstr ""
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1721 src/localplayer.cpp:1728 src/localplayer.cpp:1735
msgid "job"
msgstr ""
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1916
msgid "(D) default moves"
msgstr ""
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1917
msgid "(I) invert moves"
msgstr ""
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1918
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1919
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1920
msgid "(d) double normal + crazy"
msgstr ""
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1921
msgid "(?) unknown move"
msgstr ""
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1943
#, c-format
-msgid "(%d) crazy move number %d"
+msgid "(%u) crazy move number %u"
msgstr ""
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1948
msgid "(a) custom crazy move"
msgstr ""
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1952
msgid "(?) crazy move"
msgstr ""
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1966
msgid "(0) default moves to target"
msgstr ""
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1967
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1968
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1969
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1970
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1971
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1972
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1973
msgid "(a) archer attack range"
msgstr ""
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1974
+msgid "(B) moves to target in attack range - 1"
+msgstr ""
+
+#: src/localplayer.cpp:1975
msgid "(?) move to target"
msgstr "(?)移动到目标"
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1994
msgid "(D) default follow"
msgstr ""
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1995
msgid "(R) relative follow"
msgstr ""
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1996
msgid "(M) mirror follow"
msgstr ""
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1997
msgid "(P) pet follow"
msgstr ""
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1998
msgid "(?) unknown follow"
msgstr ""
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2017 src/localplayer.cpp:2021 src/localplayer.cpp:2044
msgid "(?) attack"
msgstr "(?) 攻击"
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2018 src/localplayer.cpp:2040
msgid "(D) default attack"
msgstr ""
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2019
msgid "(s) switch attack without shield"
msgstr ""
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2020
msgid "(S) switch attack with shield"
msgstr ""
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2041
msgid "(G) go and attack"
msgstr "(G) 去攻击"
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2042
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2043
msgid "(d) without auto attack"
msgstr ""
-#: src/localplayer.cpp:2089
+#: src/localplayer.cpp:2095
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/localplayer.cpp:2090
+#: src/localplayer.cpp:2096
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2097
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2098
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2099
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2100
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2101
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2102
msgid "(?) pick up"
msgstr "(?)拿起"
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2115
msgid "(N) normal map view"
msgstr ""
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2116
msgid "(D) debug map view"
msgstr ""
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2117
msgid "(u) ultra map view"
msgstr ""
-#: src/localplayer.cpp:2112
+#: src/localplayer.cpp:2118
msgid "(U) ultra map view 2"
msgstr ""
-#: src/localplayer.cpp:2113
+#: src/localplayer.cpp:2119
msgid "(e) empty map view"
msgstr ""
-#: src/localplayer.cpp:2114
+#: src/localplayer.cpp:2120
msgid "(b) black & white map view"
msgstr ""
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2139
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2140
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/localplayer.cpp:2135
+#: src/localplayer.cpp:2141
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/localplayer.cpp:2136
+#: src/localplayer.cpp:2142
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/localplayer.cpp:2137
+#: src/localplayer.cpp:2143
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/localplayer.cpp:2138
+#: src/localplayer.cpp:2144
msgid "(?) magic attack"
msgstr ""
-#: src/localplayer.cpp:2157
+#: src/localplayer.cpp:2163
msgid "(a) attack all players"
msgstr ""
-#: src/localplayer.cpp:2158
+#: src/localplayer.cpp:2164
msgid "(f) attack all except friends"
msgstr ""
-#: src/localplayer.cpp:2159
+#: src/localplayer.cpp:2165
msgid "(b) attack bad relations"
msgstr ""
-#: src/localplayer.cpp:2160
+#: src/localplayer.cpp:2166
msgid "(d) don't attack players"
msgstr ""
-#: src/localplayer.cpp:2161
+#: src/localplayer.cpp:2167
msgid "(?) pvp attack"
msgstr ""
-#: src/localplayer.cpp:2180
+#: src/localplayer.cpp:2186
msgid "(D) default imitation"
msgstr ""
-#: src/localplayer.cpp:2181
+#: src/localplayer.cpp:2187
msgid "(O) outfits imitation"
msgstr ""
-#: src/localplayer.cpp:2182
+#: src/localplayer.cpp:2188
msgid "(?) imitation"
msgstr ""
-#: src/localplayer.cpp:2210
+#: src/localplayer.cpp:2216
msgid "Away"
msgstr "距离"
-#: src/localplayer.cpp:2230
+#: src/localplayer.cpp:2236
msgid "(O) on keyboard"
msgstr ""
-#: src/localplayer.cpp:2231
+#: src/localplayer.cpp:2237
msgid "(A) away"
msgstr ""
-#: src/localplayer.cpp:2232 src/localplayer.cpp:2247
+#: src/localplayer.cpp:2238 src/localplayer.cpp:2253
msgid "(?) away"
msgstr ""
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2251
msgid "(G) game camera mode"
msgstr ""
-#: src/localplayer.cpp:2246
+#: src/localplayer.cpp:2252
msgid "(F) free camera mode"
msgstr ""
-#: src/localplayer.cpp:2271
+#: src/localplayer.cpp:2277
msgid "Game modifiers are enabled"
msgstr ""
-#: src/localplayer.cpp:2272
+#: src/localplayer.cpp:2278
msgid "Game modifiers are disabled"
msgstr ""
-#: src/localplayer.cpp:2273
+#: src/localplayer.cpp:2279
msgid "Game modifiers are unknown"
msgstr ""
-#: src/localplayer.cpp:3790
+#: src/localplayer.cpp:3804
msgid "Follow: "
msgstr "跟随:"
-#: src/localplayer.cpp:3792 src/localplayer.cpp:3807
+#: src/localplayer.cpp:3806 src/localplayer.cpp:3821
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3799
+#: src/localplayer.cpp:3813
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3801 src/localplayer.cpp:3809
+#: src/localplayer.cpp:3815 src/localplayer.cpp:3823
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:4160
+#: src/localplayer.cpp:4174
msgid "You see "
msgstr "你看"
@@ -5436,115 +5431,115 @@ msgstr ""
"<策略>可以为“1”,“yes”,“true”其中之一以开启物品共享,或者 是\"0\",\"no\","
"\"false\"用来禁止物品共享。"
-#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
-#: src/net/ea/playerhandler.cpp:430
+#: src/net/ea/playerhandler.cpp:340 src/net/ea/playerhandler.cpp:350
+#: src/net/ea/playerhandler.cpp:445
msgid "Message"
msgstr "讯息"
-#: src/net/ea/playerhandler.cpp:339
+#: src/net/ea/playerhandler.cpp:341
msgid ""
"You are carrying more than half your weight. You are unable to regain health."
msgstr "你已携带超过半数负重。无法回复健康(体力)"
-#: src/net/ea/playerhandler.cpp:349
+#: src/net/ea/playerhandler.cpp:351
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
-#: src/net/ea/playerhandler.cpp:455
+#: src/net/ea/playerhandler.cpp:472
#, c-format
msgid "You picked up %s."
msgstr "你捡起了%s"
-#: src/net/ea/playerhandler.cpp:461
+#: src/net/ea/playerhandler.cpp:477
#, c-format
msgid "You spent %s."
msgstr "你花费 %s."
-#: src/net/ea/playerhandler.cpp:507
+#: src/net/ea/playerhandler.cpp:526
msgid "Cannot raise skill!"
msgstr "不能提升技能!"
-#: src/net/ea/playerhandler.cpp:625
+#: src/net/ea/playerhandler.cpp:655
msgid "Equip arrows first."
msgstr "请先装备弓箭。"
-#: src/net/ea/specialhandler.cpp:143
+#: src/net/ea/specialhandler.cpp:145
msgid "Trade failed!"
msgstr "交易失败!"
-#: src/net/ea/specialhandler.cpp:146
+#: src/net/ea/specialhandler.cpp:148
msgid "Emote failed!"
msgstr "发送表情失败!"
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:151
msgid "Sit failed!"
msgstr "原地休息失败!"
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:154
msgid "Chat creating failed!"
msgstr "聊天创建失败!"
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:157
msgid "Could not join party!"
msgstr "不能加入工会!"
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:160
msgid "Cannot shout!"
msgstr "无法呼喊!"
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:173
msgid "You have not yet reached a high enough lvl!"
msgstr "你还没有达到足够的等级!"
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:176
msgid "Insufficient HP!"
msgstr "HP不足!"
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:179
msgid "Insufficient SP!"
msgstr "SP不足!"
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:182
msgid "You have no memos!"
msgstr "没有备忘录"
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:185
msgid "You cannot do that right now!"
msgstr "你无法办到!"
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:188
msgid "Seems you need more money... ;-)"
msgstr "看起来需要更多金币…… ;-)"
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:191
msgid "You cannot use this skill with that kind of weapon!"
msgstr "此武器无法用来使用此项技能!"
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:195
msgid "You need another red gem!"
msgstr "你需要另一颗红宝石!"
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:198
msgid "You need another blue gem!"
msgstr "你需要另一颗蓝宝石!"
-#: src/net/ea/specialhandler.cpp:199
+#: src/net/ea/specialhandler.cpp:201
msgid "You're carrying to much to do this!"
msgstr "你已负重太多,无法办到!"
-#: src/net/ea/specialhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:204
msgid "Huh? What's that?"
msgstr "啊?那是什么?"
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:215
msgid "Warp failed..."
msgstr "传送失败..."
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:218
msgid "Could not steal anything..."
msgstr "无法偷取任何物品..."
-#: src/net/ea/specialhandler.cpp:219
+#: src/net/ea/specialhandler.cpp:221
msgid "Poison had no effect..."
msgstr "毒药无效..."
@@ -5685,19 +5680,19 @@ msgstr "%闪避"
msgid "% Critical"
msgstr "%"
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:282
msgid "Attack Delay"
msgstr "攻击延迟"
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:284
msgid "Walk Delay"
msgstr "步行延迟"
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Range"
msgstr "攻击范围"
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:288
msgid "Damage per sec."
msgstr "每秒伤害"
@@ -5817,172 +5812,3 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "未知物品"
-
-#~ msgid "Could Not Load Map"
-#~ msgstr "不能加载地图"
-
-#~ msgid "Error while loading %s"
-#~ msgstr "加载%s时出现错误"
-
-#~ msgid "Strength %+.1f"
-#~ msgstr "力量%+.1f"
-
-#~ msgid "Agility %+.1f"
-#~ msgstr "敏捷 %+.1f"
-
-#~ msgid "Dexterity %+.1f"
-#~ msgstr "灵巧%+.1f"
-
-#~ msgid "Vitality %+.1f"
-#~ msgstr "活力%+.1f"
-
-#~ msgid "Intelligence %+.1f"
-#~ msgstr "智慧%+.1f"
-
-#~ msgid "Willpower"
-#~ msgstr "意志"
-
-#~ msgid "Willpower %+.1f"
-#~ msgstr "意志力%+.1f"
-
-#~ msgid "Press OK to respawn."
-#~ msgstr "按确定以重生。"
-
-#~ msgid "You Died"
-#~ msgstr "你死了"
-
-#~ msgid "Not logged in."
-#~ msgstr "未登录。"
-
-#~ msgid "No empty slot."
-#~ msgstr "无空槽。"
-
-#~ msgid "Invalid name."
-#~ msgstr "名称无效。"
-
-#~ msgid "Character's name already exists."
-#~ msgstr "人物的名字已经存在。"
-
-#~ msgid "Invalid hairstyle."
-#~ msgstr "无效的发型。"
-
-#~ msgid "Invalid hair color."
-#~ msgstr "头发的颜色无效。"
-
-#~ msgid "Invalid gender."
-#~ msgstr "无效的性别。"
-
-#~ msgid "Character's stats are too high."
-#~ msgstr "字符的统计太高。"
-
-#~ msgid "Character's stats are too low."
-#~ msgstr "字符的统计过低。"
-
-#~ msgid "Player deleted."
-#~ msgstr "删除。"
-
-#~ msgid "Selection out of range."
-#~ msgstr "范围。"
-
-#~ msgid "Unknown error (%d)."
-#~ msgstr "未知错误(%d)"
-
-#~ msgid "No gameservers are available."
-#~ msgstr "无 游戏服务器 可用。"
-
-#~ msgid "Topic: %s"
-#~ msgstr "主题:%s"
-
-#~ msgid "Players in this channel:"
-#~ msgstr "玩家在此通道:"
-
-#~ msgid "Error joining channel."
-#~ msgstr "加入通道时发生错误。"
-
-#~ msgid "Listing channels."
-#~ msgstr "上市渠道。"
-
-#~ msgid "%s has kicked %s."
-#~ msgstr "%s已被%s踢出"
-
-#~ msgid "Error creating guild."
-#~ msgstr "创建公会时发生错误。"
-
-#~ msgid "Invite sent."
-#~ msgstr "邀请已发送。"
-
-#~ msgid "Member was promoted successfully."
-#~ msgstr "会员晋升成功。"
-
-#~ msgid "Failed to promote member."
-#~ msgstr "晋升会员失败。"
-
-#~ msgid "Wrong magic_token."
-#~ msgstr "错误magic_token。"
-
-#~ msgid "Already logged in."
-#~ msgstr "已登录。"
-
-#~ msgid "Account banned."
-#~ msgstr "帐户被禁止。"
-
-#~ msgid "New password incorrect."
-#~ msgstr "新密码不正确。"
-
-#~ msgid "Account not connected. Please login first."
-#~ msgstr "账户未连接。请先登录。"
-
-#~ msgid "New email address incorrect."
-#~ msgstr "新的电子邮件地址不正确。"
-
-#~ msgid "Old email address incorrect."
-#~ msgstr "旧的电子邮件地址不正确。"
-
-#~ msgid "The new email address already exists."
-#~ msgstr "新的电子邮件地址已存在。"
-
-#~ msgid ""
-#~ "Client registration is not allowed. Please contact server administration."
-#~ msgstr "客户端注册是不允许的。请联系服务器管理。"
-
-#~ msgid "Client version is too old."
-#~ msgstr "客户端版本太旧。"
-
-#~ msgid "Wrong username or password."
-#~ msgstr "用户名或密码错误。"
-
-#~ msgid "Account banned"
-#~ msgstr "帐户被禁止"
-
-#~ msgid "Login attempt too soon after previous attempt."
-#~ msgstr "登录尝试后,以前的尝试还为时过早。"
-
-#~ msgid "Wrong username, password or email address."
-#~ msgstr "错误的用户名,密码或电子邮件地址。"
-
-#~ msgid "Username already exists."
-#~ msgstr "用户名已存在。"
-
-#~ msgid "Email address already exists."
-#~ msgstr "电子邮件地址已存在。"
-
-#~ msgid "You took too long with the captcha or your response was incorrect."
-#~ msgstr "你的时间太长与CAPTCHA或你的反应是不正确的。"
-
-#~ msgid "Joined party."
-#~ msgstr "加入了帮会。"
-
-#~ msgid "%s joined the party."
-#~ msgstr "%s加入了帮会。"
-
-#~ msgid "%s rejected your invite."
-#~ msgstr "%s的拒绝你的邀请。"
-
-#~ msgid "Accepting incoming trade requests."
-#~ msgstr "正在接受交易请求"
-
-#~ msgid "Ignoring incoming trade requests."
-#~ msgstr "忽略交易请求"
-
-#~ msgid "Trading with %s"
-#~ msgstr "与%s交易中"