summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-08-29 14:58:04 +0300
committerAndrei Karas <akaras@inbox.ru>2011-08-29 14:58:04 +0300
commit552781d7e35fd773ae08e9d1c0cc12c1f245d4ed (patch)
tree2e6b00747be9a0cd7347727870dd4ba895a771d0 /po/zh_CN.po
parentf2286853ea4322c980b05577bbc04ed2c211997b (diff)
downloadplus-552781d7e35fd773ae08e9d1c0cc12c1f245d4ed.tar.gz
plus-552781d7e35fd773ae08e9d1c0cc12c1f245d4ed.tar.bz2
plus-552781d7e35fd773ae08e9d1c0cc12c1f245d4ed.tar.xz
plus-552781d7e35fd773ae08e9d1c0cc12c1f245d4ed.zip
Update and rebuild translations.
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po915
1 files changed, 468 insertions, 447 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 779f21790..aeeba6e52 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
"team/zh_CN/)\n"
@@ -23,266 +23,266 @@ msgstr ""
msgid "Visible on map"
msgstr "在地图上可见"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "dodge"
msgstr "躲闪"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "miss"
msgstr "小姐"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1525
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1530
msgid "I"
msgstr "I"
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "设置"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "连接到服务器"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "登录"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "进入游戏世界"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "请求字符"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "连接到游戏服务器"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "更改游戏服务器"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "错误"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "申请登记的详细信息"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "密码更改"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "密码成功!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "电子邮件变更"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "电子邮件已变更成功!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "注销成功"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "永别了,任何时候回来... ..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "创建更新目录错误!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:302
msgid "Unknown command."
msgstr "未知命令。"
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "无法发送空白密语!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:416
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr "无法同 \"%s\" 建立一个私人谈话标签页!或者已经存在,或者那就是自己。"
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "请求加入频道%s。"
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:452 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "帮会名称缺失。"
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:463
msgid "Guild name is missing."
msgstr "公会名称是缺少的。"
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:588
+#: src/commandhandler.cpp:629 src/commandhandler.cpp:659
msgid "Please specify a name."
msgstr "请指定一个名称。"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Message closes chat."
msgstr "讯息关闭聊天。"
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
msgid "Return now toggles chat."
msgstr "<回车>键现在切换聊天。"
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
msgid "Message now closes chat."
msgstr "讯息现在关闭聊天。"
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:567
msgid "friend"
msgstr "朋友"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:572
msgid "disregarded"
msgstr "无视"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:577
msgid "neutral"
msgstr "中性"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:596
#, c-format
msgid "Player already %s!"
msgstr "玩家已经%s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "玩家成功%s!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
msgstr ""
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:640
msgid "Player wasn't ignored!"
msgstr "是不能忽视的!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:647
msgid "Player no longer ignored!"
msgstr "玩家不再被忽略!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:649
msgid "Player could not be unignored!"
msgstr "玩家不能被忽略!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:666
msgid "Player already erased!"
msgstr "玩家已经被删除!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:677
msgid "Player successfully erased!"
msgstr ""
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:679
msgid "Player could not be erased!"
msgstr ""
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:978 src/commandhandler.cpp:1024
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:988
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1100
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1112
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1116
msgid "Created:"
msgstr "创建于:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1118
msgid "Deleted:"
msgstr "删除:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1165 src/commandhandler.cpp:1172
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource orphaned images:"
msgstr ""
@@ -291,43 +291,43 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "/%s的选项是\"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"。"
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "常规"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "调试 "
-#: src/game.cpp:488
+#: src/game.cpp:505
msgid "Screenshot saved as "
msgstr "截图保存为"
-#: src/game.cpp:496
+#: src/game.cpp:513
msgid "Saving screenshot failed!"
msgstr "保存屏幕快照失败!"
-#: src/game.cpp:536
+#: src/game.cpp:553
msgid "The connection to the server was lost."
msgstr "服务器的连接丢失。"
-#: src/game.cpp:548
+#: src/game.cpp:565
msgid "Network Error"
msgstr "网络错误"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "忽略新进的交易请求"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "接受传入的交易请求"
-#: src/game.cpp:1606
+#: src/game.cpp:1623
msgid "Could Not Load Map"
msgstr "不能加载地图"
-#: src/game.cpp:1607
+#: src/game.cpp:1624
#, c-format
msgid "Error while loading %s"
msgstr "加载%s时出现错误"
@@ -356,37 +356,37 @@ msgstr "评论: %s"
msgid "Bot Checker"
msgstr "机器人检查"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "姓名"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:135
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:648
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
msgid "Attack"
msgstr "攻击"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:299
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "说话"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:304 src/gui/popupmenu.cpp:705
msgid "Move"
msgstr "移动"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "结果"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
msgid "Reset"
msgstr "重置"
#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:719
msgid "Buy"
msgstr "购买"
@@ -400,7 +400,7 @@ msgstr "价格:%s / 总价:%s"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:972
msgid "+"
msgstr "+"
@@ -408,20 +408,20 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:984
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "退出"
#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/statuswindow.cpp:971 src/gui/statuswindow.cpp:1002
msgid "Max"
msgstr "最大"
@@ -430,8 +430,8 @@ msgstr "最大"
msgid "Shop"
msgstr "商店"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:721
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:92
msgid "Sell"
@@ -440,19 +440,19 @@ msgstr "出售"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:518 src/gui/popupmenu.cpp:542
+#: src/gui/popupmenu.cpp:556 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:792 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:1736 src/gui/popupmenu.cpp:1764
+#: src/gui/popupmenu.cpp:1820 src/gui/popupmenu.cpp:1863
+#: src/gui/popupmenu.cpp:1898 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2025
#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "取消"
@@ -527,14 +527,14 @@ 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:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:85
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:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
@@ -551,7 +551,7 @@ msgid "Race:"
msgstr ""
#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/socialwindow.cpp:1137
msgid "Create"
msgstr "建立"
@@ -618,9 +618,9 @@ msgstr "删除字符输入的密码"
msgid "Enter password:"
msgstr "输入密码:"
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/shopwindow.cpp:124 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "删除"
@@ -705,12 +705,12 @@ msgstr "???"
msgid "Chat"
msgstr "聊天"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:607
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
#, c-format
msgid "Whispering to %s: %s"
msgstr "对%s密语到:%s"
@@ -723,10 +723,10 @@ msgstr "是"
msgid "No"
msgstr "否"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:671
msgid "Ignore"
msgstr "忽略"
@@ -872,7 +872,7 @@ msgstr "你知道吗?"
#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:590 src/gui/shopwindow.cpp:111
msgid "Close"
msgstr "关闭"
@@ -899,8 +899,8 @@ msgstr "装备"
#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1695 src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1835
msgid "Unequip"
msgstr "卸下装备"
@@ -938,31 +938,31 @@ msgid "id"
msgstr "id"
#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1697
+#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1837
msgid "Equip"
msgstr "装备"
#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1840
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1844
msgid "Drop..."
msgstr "掉落... ..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1853
msgid "Split"
msgstr "分离"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:551
msgid "Outfits"
msgstr "装具"
@@ -971,17 +971,17 @@ msgid "Weight:"
msgstr "重量:"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1856 src/gui/setup.cpp:72
msgid "Store"
msgstr "存储"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "取回"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1849
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "丢弃"
@@ -1022,11 +1022,11 @@ msgstr ""
msgid "Unknown."
msgstr "未知。"
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ","
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "重量:%s"
@@ -1117,6 +1117,10 @@ msgstr "%s %d?"
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:458 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "你已经离开工会."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "正常"
@@ -1133,7 +1137,7 @@ msgstr "跳过"
msgid "Login"
msgstr "登录"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "服务器:"
@@ -1215,7 +1219,7 @@ msgstr "提交"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr "清除"
@@ -1235,338 +1239,338 @@ msgstr "发送"
msgid "Failed to send as sender or letter invalid."
msgstr "发送信件失败或者信件无效。"
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr ""
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr ""
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr ""
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:647
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "交易"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:395
msgid "Whisper"
msgstr "密语"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:652
msgid "Heal"
msgstr "愈合"
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:659
msgid "Be friend"
msgstr "是朋友"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:409 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:669
+#: src/gui/popupmenu.cpp:693
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:680 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:691
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:187
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:679 src/gui/popupmenu.cpp:695
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "完全忽略"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:703
msgid "Follow"
msgstr "按照"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:704
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:741
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:746
msgid "Kick from party"
msgstr "踢从党"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:239
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:763
msgid "Kick from guild"
msgstr "踢从公会"
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:768
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:778
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:262
msgid "Kick player"
msgstr "踢球员"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:264
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:706
msgid "Show Items"
msgstr "显示项目"
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:2022
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:306
+#: src/gui/popupmenu.cpp:440 src/gui/popupmenu.cpp:709
+#: src/gui/popupmenu.cpp:788
msgid "Add comment"
msgstr "发表评论"
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:726
msgid "Buy (?)"
msgstr "购买(?)"
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:728
msgid "Sell (?)"
msgstr "出售(?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:318
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:335
msgid "Add to priority attack list"
msgstr "优先攻击列表"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:337
msgid "Add to attack list"
msgstr "加入攻击清单"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:340
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:353 src/gui/popupmenu.cpp:488
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:514
msgid "Pick up"
msgstr "拾取"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:515 src/gui/popupmenu.cpp:1734
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1857
msgid "Add to chat"
msgstr "加入聊天"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:532
msgid "Map Item"
msgstr "地图项"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:533
msgid "Rename"
msgstr "重命名"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:534 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:1993 src/gui/popupmenu.cpp:1998
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:539
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:553
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:569 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "法术"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:571
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:572
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:598
msgid "Disable highlight"
msgstr "禁用"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:603
msgid "Enable highlight"
msgstr "启用突出"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:608
+msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:613
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:618
msgid "Enable away"
msgstr "启用远"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:623
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:629 src/gui/socialwindow.cpp:1139
msgid "Leave"
msgstr "留下"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:800
msgid "Change guild position"
msgstr "更改公会的立场"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1236
msgid "Rename map sign "
msgstr "重命名的地图标志"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1238
msgid "Name: "
msgstr "名称:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1288
msgid "Player comment "
msgstr "玩家评论"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1290
msgid "Comment: "
msgstr "评论:"
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1659
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1665
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1670
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1682
msgid "Store 10"
msgstr "商店10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1685
msgid "Store half"
msgstr "商店的一半"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1687
msgid "Store all"
msgstr "商店所有"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop all"
msgstr "所有"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1726
msgid "Retrieve 10"
msgstr "拿出10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve half"
msgstr "拿出一半"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve all"
msgstr "检索所有"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1861
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1922
msgid "Hide"
msgstr "隐藏"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1928
msgid "Show"
msgstr "显示"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1935
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1937 src/gui/statuswindow.cpp:240
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1955 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(默认)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1985
msgid "Move up"
msgstr "x"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:1990
msgid "Move down"
msgstr ""
@@ -1610,64 +1614,64 @@ msgstr "密码不能少于%d个字符。"
msgid "Passwords do not match."
msgstr "密码不一致."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "选择您的服务器"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "选择你的服务器***安全模式***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "端口:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "游戏分服务器使用相同的IP"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "服务器类型:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "负载"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "连接"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "自定义服务器"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "请输入服务器的IP地址和端口"
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "下载服务器列表...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "等待服务器..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "准备下载"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "错误retreiving的服务器列表!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "需要较新版本"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "需要 v%s"
@@ -1812,6 +1816,14 @@ msgstr "时间"
msgid "Use local time"
msgstr "使用本地时间"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:154
+msgid "Other"
+msgstr "其他"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "这就是该色彩看起来的样子"
@@ -2040,34 +2052,38 @@ msgid "Log NPC dialogue"
msgstr "NPC对话"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "其他"
+msgid "Bots support"
+msgstr ""
#: src/gui/setup_other.cpp:150
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:156
msgid "Enable server side attack"
msgstr "启用服务器端的攻击"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:159
msgid "Enable bot checker"
msgstr "启用BOT检查"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
msgid "Enable buggy servers protection"
msgstr "启用BUG保护"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:165
msgid "Enable debug log"
msgstr "启用调试日志"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:168
msgid "Low traffic mode"
msgstr "低流量模式"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:171
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
msgid "Show background"
msgstr "显示背景"
@@ -2447,249 +2463,254 @@ msgstr "购买物品"
msgid "Sell items"
msgstr "出售物品"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:123
#: src/gui/tradewindow.cpp:88
msgid "Add"
msgstr "添加"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:125
msgid "Announce"
msgstr "公布"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:122 src/gui/shopwindow.cpp:126
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr "显示在公布的联系"
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:737 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "请求交易"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:738
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s想要%s %s 你接受吗?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "技能"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:287
msgid "Up"
msgstr "升级"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:340
#, c-format
msgid "Skill points available: %d"
msgstr "技能点:%d个"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:417
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:429
#, c-format
msgid "Skill %d"
msgstr "技能为%d"
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:496 src/gui/skilldialog.cpp:549
#, c-format
msgid "Lvl: %d"
msgstr "等级: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "等级: %d(%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "帮会"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "邀请用户%s加入公会%s"
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "退出公会%s的请求。"
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "会员邀请到公会"
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "你要邀请谁加入工会%s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "离开公会?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "你确定要离开工会%s吗?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "t"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "邀请用户%s加入团队."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr ""
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "离开团队?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr ""
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "攻击暴徒"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "创建帮会"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1501
msgid "Create Party"
msgstr "建立"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1138
msgid "Invite"
msgstr "邀请"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1284
#, c-format
msgid "Accepted party invite from %s."
msgstr "接受%s团队的邀请."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
#, c-format
msgid "Rejected party invite from %s."
msgstr "拒绝%s的团队邀请."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
#, c-format
msgid "Accepted guild invite from %s."
msgstr "已接受公会邀请来自%s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
#, c-format
msgid "Rejected guild invite from %s."
msgstr "拒绝%s的公会邀请."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
#, c-format
msgid "Creating guild called %s."
msgstr "创建公会的名为%s"
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
#, c-format
msgid "Creating party called %s."
msgstr "创建团队名字为%s的"
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1408
msgid "Guild Name"
msgstr "公会名称"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1409
msgid "Choose your guild's name."
msgstr "选择你的公会的名字."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1423
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1429
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s邀请你加入公会%s"
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1435
msgid "Accept Guild Invite"
msgstr "接受邀请"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1450
msgid "Received party request, but one already exists."
msgstr "接受到一个已经存在的帮会邀请。"
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1461
msgid "You have been invited you to join a party."
msgstr "您已被邀请您加入党。"
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1465
#, c-format
msgid "You have been invited to join the %s party."
msgstr "您已被邀请加入%s的团队。"
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s已经邀请你加入他们的帮会。"
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s已经邀请你加入帮会%s。"
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
msgid "Accept Party Invite"
msgstr "接受帮会邀请"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1502
msgid "Cannot create party. You are already in a party"
msgstr "无法建立团队.您已经在一个队伍中了"
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1507
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1508
msgid "Choose your party's name."
msgstr "选择n的名称。"
@@ -2697,243 +2718,243 @@ msgstr "选择n的名称。"
msgid "Specials"
msgstr "特价商品"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr ""
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?)移动到目标"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) 攻击"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) 去攻击"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?)拿起"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr ""
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr ""
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr ""
@@ -3242,33 +3263,33 @@ msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
msgid "Name: %s"
msgstr "姓名:%s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "更新..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "连接中..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "开始"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 更新过程不完整。"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 强烈建议"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "已完成"
@@ -3501,7 +3522,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "该命令使<昵称>成为频道管理员。"
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "如果<昵称>之间有空格,用双引号(\")括起来。"
@@ -3539,6 +3561,41 @@ msgstr "%s 全局公告:"
msgid "%s whispers: %s"
msgstr "%s私语:%s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "命令:/invite <昵称>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "命令:/leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > 显示该帮助信息。"
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > "
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > "
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick >"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "编辑"
@@ -4304,28 +4361,28 @@ msgstr "角色已删除。"
msgid "Failed to delete character."
msgstr "删除角色失败。"
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr "聊天频道不被支持!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "密语无法发送,%s离线。"
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr ""
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "MVP球员。"
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "MVP球员:"
@@ -4342,38 +4399,6 @@ msgstr "游戏"
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "命令:/invite <昵称>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "命令:/leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > 显示该帮助信息。"
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > "
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > "
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick >"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "帮会已创建"
@@ -4390,85 +4415,81 @@ msgstr ""
msgid "Unknown server response."
msgstr "未知的服务器的响应。"
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "工会会长: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "工会等级: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "在线玩家: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "最大成员: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "平均等级: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "工会经验值: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "工会下一级所需经验: %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr ""
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "用户现在是你们的工会成员了."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr ""
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "未知工会邀请响应."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "你已经离开工会."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s已经离开工会."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "你已经被工会开除!."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s已经被工会开除."