From 45df5234de5af24af5d60e2e92ad724079a7c5b1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 13 Apr 2012 02:56:59 +0300
Subject: Update and rebuild translations.

---
 po/zh_CN.po | 3600 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1831 insertions(+), 1769 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7d63cdcd7..be8ab0df1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-31 19:47+0300\n"
-"PO-Revision-Date: 2012-03-28 22:29+0000\n"
+"POT-Creation-Date: 2012-04-13 02:11+0300\n"
+"PO-Revision-Date: 2012-04-12 23:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -29,7 +29,7 @@ msgstr "忽略新进的交易请求"
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/actorspritemanager.cpp:1163
+#: src/actorspritemanager.cpp:1162
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -46,56 +46,56 @@ msgid "miss"
 msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:766
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:771
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
+#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:103
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:976 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:981 src/gui/setup_video.cpp:237
+#: src/client.cpp:993 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:986
+#: src/client.cpp:998
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1084
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1122
 msgid "Logging in"
 msgstr "尝试捡起不存在的物品。"
 
-#: src/client.cpp:1144
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "捡起物品发生不存在的物品。"
 
-#: src/client.cpp:1248
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1283
+#: src/client.cpp:1295
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1293
+#: src/client.cpp:1305
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1336 src/client.cpp:1344 src/client.cpp:1479
+#: src/client.cpp:1348 src/client.cpp:1356 src/client.cpp:1491
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:277 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:239
@@ -105,50 +105,50 @@ msgstr "更改游戏服务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1354
+#: src/client.cpp:1366
 msgid "Requesting registration details"
 msgstr "请求注册的详细信息"
 
-#: src/client.cpp:1380
+#: src/client.cpp:1392
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1381
+#: src/client.cpp:1393
 msgid "Password changed successfully!"
 msgstr "更改密码成功！"
 
-#: src/client.cpp:1400
+#: src/client.cpp:1412
 msgid "Email Change"
 msgstr "更改电子邮件"
 
-#: src/client.cpp:1401
+#: src/client.cpp:1413
 msgid "Email changed successfully!"
 msgstr "更改电子邮件成功！"
 
-#: src/client.cpp:1421
+#: src/client.cpp:1433
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1422
+#: src/client.cpp:1434
 msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
-#: src/client.cpp:1641 src/client.cpp:1674 src/client.cpp:1689
-#: src/client.cpp:2121 src/client.cpp:2128
+#: src/client.cpp:1653 src/client.cpp:1686 src/client.cpp:1701
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
 
-#: src/client.cpp:1828
+#: src/client.cpp:1840
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1862 src/client.cpp:1868
+#: src/client.cpp:1874 src/client.cpp:1880
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1889
+#: src/client.cpp:1901
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在并且无法创建！退出。"
@@ -325,35 +325,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:505
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:513
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:555
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:556
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1087
+#: src/game.cpp:943
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1088
+#: src/game.cpp:944
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -378,87 +378,87 @@ msgstr "Pvp等级: %d"
 msgid "Comment: %s"
 msgstr "评论: %s"
 
-#: src/gui/botcheckerwindow.cpp:266
+#: src/gui/botcheckerwindow.cpp:267
 msgid "Bot Checker"
 msgstr "挂机检查"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
+#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:62
 msgid "Name"
 msgstr "姓名"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/setup_input.cpp:74 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "攻击"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboarddata.h:124
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/setup_input.cpp:102
 msgid "Talk"
 msgstr "说话"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:270
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
 #: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
 #: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
 #: src/gui/popupmenu.cpp:846
 msgid "Move"
 msgstr "移动"
 
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:301
 msgid "Result"
 msgstr "结果"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:132
 msgid "Reset"
 msgstr "重置"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
 #: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
-#: src/gui/buydialog.cpp:103
+#: src/gui/buydialog.cpp:102
 msgid "Amount:"
 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:108 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:121
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 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:111 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:122
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboarddata.h:208
+#: src/gui/setup_input.cpp:158
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
 #: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:175 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "商店"
 
@@ -478,12 +478,12 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
 #: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
 #: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:888
-#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2028
-#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
-#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
+#: src/gui/popupmenu.cpp:1890 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1978 src/gui/popupmenu.cpp:2024
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2102
+#: src/gui/popupmenu.cpp:2156 src/gui/popupmenu.cpp:2178
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1200 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:169
 msgid "Cancel"
@@ -561,14 +561,14 @@ msgstr "姓名"
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
 #: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
-#: src/gui/outfitwindow.cpp:88
+#: 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:105 src/gui/charcreatedialog.cpp:109
-#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:88
 msgid "<"
 msgstr "<"
 
@@ -589,7 +589,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Create"
 msgstr "建立"
 
@@ -603,7 +603,7 @@ msgstr "美女"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
 #: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
+#: src/gui/setup_other.cpp:193 src/gui/setup_visual.cpp:89
 msgid "Other"
 msgstr "其他"
 
@@ -681,64 +681,64 @@ msgstr "等级 %d"
 msgid "(empty)"
 msgstr "()"
 
-#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
-#: src/gui/setup_visual.cpp:92
+#: src/gui/chatwindow.cpp:119 src/gui/inventorywindow.cpp:71
+#: src/gui/setup_visual.cpp:95
 msgid "default"
 msgstr "默认"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:120
 msgid "black"
 msgstr "黑色"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:121
 msgid "red"
 msgstr "红色"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:122
 msgid "green"
 msgstr "绿色"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:123
 msgid "blue"
 msgstr "蓝色"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:124
 msgid "gold"
 msgstr "金"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:125
 msgid "yellow"
 msgstr "黄色"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:126
 msgid "pink"
 msgstr "粉红色"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:127
 msgid "purple"
 msgstr "紫"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:128
 msgid "grey"
 msgstr "灰色"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:129
 msgid "brown"
 msgstr "棕色"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 1"
 msgstr "彩虹1"
 
-#: src/gui/chatwindow.cpp:130
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 2"
 msgstr "彩虹2"
 
-#: src/gui/chatwindow.cpp:131
+#: src/gui/chatwindow.cpp:132
 msgid "rainbow 3"
 msgstr "彩虹3"
 
-#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:150 src/gui/inventorywindow.cpp:91
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -748,16 +748,16 @@ msgstr "彩虹3"
 msgid "???"
 msgstr "？？？"
 
-#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:160 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:665
+#: src/gui/chatwindow.cpp:669
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1052
+#: src/gui/chatwindow.cpp:1080
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -935,7 +935,7 @@ msgid "Did You Know?"
 msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
-#: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:204 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
@@ -982,13 +982,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:76
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:77
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:544 src/gui/popupmenu.cpp:1855
-#: src/gui/popupmenu.cpp:1951 src/gui/popupmenu.cpp:1998
+#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:161
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1995
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -996,85 +996,85 @@ msgstr "卸下装备"
 msgid "Help"
 msgstr "帮助"
 
-#: src/gui/inventorywindow.cpp:71
+#: src/gui/inventorywindow.cpp:72
 msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72
+#: src/gui/inventorywindow.cpp:73
 msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:74
 msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:75
 msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:76
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
+#: src/gui/inventorywindow.cpp:113 src/gui/windowmenu.cpp:79
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "物品栏"
 
-#: src/gui/inventorywindow.cpp:137
+#: src/gui/inventorywindow.cpp:138
 msgid "Slots:"
 msgstr "槽："
 
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:150
 msgid "Filter:"
 msgstr "过滤器："
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:546
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1953
-#: src/gui/popupmenu.cpp:2000
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:547
+#: src/gui/popupmenu.cpp:1854 src/gui/popupmenu.cpp:1950
+#: src/gui/popupmenu.cpp:1997
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:550
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1918
-#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:2004
+#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:551
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1954 src/gui/popupmenu.cpp:2001
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1962
-#: src/gui/popupmenu.cpp:2009
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:647
+#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
+#: src/gui/popupmenu.cpp:2006
 msgid "Drop..."
 msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1875
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:2015
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:64
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "套装"
 
-#: src/gui/inventorywindow.cpp:177
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "重量："
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1974
-#: src/gui/popupmenu.cpp:2021 src/gui/setup.cpp:74
+#: src/gui/inventorywindow.cpp:202 src/gui/inventorywindow.cpp:638
+#: src/gui/popupmenu.cpp:1838 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2018 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:202 src/gui/popupmenu.cpp:1882
+#: src/gui/inventorywindow.cpp:203 src/gui/popupmenu.cpp:1879
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:99
+#: src/gui/inventorywindow.cpp:649 src/gui/popupmenu.cpp:1868
+#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:2011
+#: src/gui/windowmenu.cpp:100
 msgid "Drop"
 msgstr "丢弃"
 
@@ -1123,7 +1123,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "重量：%s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:72
 msgid "Kill stats"
 msgstr "杀敌统计"
 
@@ -1229,7 +1229,7 @@ msgstr "跳过"
 msgid "Login"
 msgstr "登录"
 
-#: src/gui/logindialog.cpp:122 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:122 src/gui/widgets/chattab.cpp:172
 msgid "Server:"
 msgstr "服务器："
 
@@ -1315,7 +1315,7 @@ msgstr "提交"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
 msgid "Clear"
 msgstr "清除"
 
@@ -1331,22 +1331,22 @@ msgstr "发送"
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
-#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:533
 #, c-format
 msgid "Outfit: %d"
 msgstr "套装： %d"
 
-#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
-#: src/gui/windowmenu.cpp:311
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
+#: src/gui/windowmenu.cpp:312
 #, c-format
 msgid "Key: %s"
 msgstr "按键：%s"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:95
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:97
+#: src/gui/outfitwindow.cpp:98
 msgid "Away outfit"
 msgstr ""
 
@@ -1473,7 +1473,7 @@ msgid "Show Items"
 msgstr "显示项目"
 
 #: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2179
+#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2175
 msgid "Undress"
 msgstr ""
 
@@ -1525,8 +1525,8 @@ msgstr "玩家"
 msgid "Pick up"
 msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1891
-#: src/gui/popupmenu.cpp:1975 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1888
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:2019
 msgid "Add to chat"
 msgstr "加入聊天"
 
@@ -1538,8 +1538,8 @@ msgstr "地图项"
 msgid "Rename"
 msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2138
-#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2145 src/gui/popupmenu.cpp:2149
 msgid "Remove"
 msgstr ""
 
@@ -1555,7 +1555,7 @@ msgstr ""
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:99
 msgid "Spells"
 msgstr "法术"
 
@@ -1591,7 +1591,7 @@ msgstr "启用远"
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1263
+#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1264
 msgid "Leave"
 msgstr "留下"
 
@@ -1614,95 +1614,95 @@ msgid "Name:                    "
 msgstr "名称："
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1425
+#: src/gui/popupmenu.cpp:1422
 msgid "Player comment            "
 msgstr "玩家评论"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1427
+#: src/gui/popupmenu.cpp:1424
 msgid "Comment:                      "
 msgstr "评论："
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1826
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1830
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1831
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1832
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1842
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1843
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:1847
+#: src/gui/popupmenu.cpp:1844
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1963
-#: src/gui/popupmenu.cpp:2010
+#: src/gui/popupmenu.cpp:1864 src/gui/popupmenu.cpp:1960
+#: src/gui/popupmenu.cpp:2007
 msgid "Drop all"
 msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1883
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1887
+#: src/gui/popupmenu.cpp:1884
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1888
+#: src/gui/popupmenu.cpp:1885
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1921 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1976
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2026
-msgid "Load old drop shortcuts"
+#: src/gui/popupmenu.cpp:2022
+msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2091
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2087
 msgid "Hide"
 msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2056 src/gui/popupmenu.cpp:2093
 msgid "Show"
 msgstr "显示"
 
-#: src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2099
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2105 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:2101 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2125 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
-#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
+#: src/gui/popupmenu.cpp:2121 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:1019 src/gui/socialwindow.cpp:1054
 msgid "(default)"
 msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2146
+#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2142
 msgid "Move up"
 msgstr "x"
 
-#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2144
 msgid "Move down"
 msgstr ""
 
@@ -2045,2400 +2045,2462 @@ msgstr "应用"
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
-msgid "Press the button to start calibration"
-msgstr "按下开始校准按钮"
+#: src/gui/setup_input.cpp:54
+msgid "Basic Keys"
+msgstr "基本按键"
 
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
-msgid "Calibrate"
-msgstr "校准"
+#: src/gui/setup_input.cpp:58
+msgid "Move Up"
+msgstr "向上移动"
 
-#: src/gui/setup_joystick.cpp:47
-msgid "Enable joystick"
-msgstr "启用游戏杆"
+#: src/gui/setup_input.cpp:62
+msgid "Move Down"
+msgstr "向下移动"
 
-#: src/gui/setup_joystick.cpp:50
-msgid "Use joystick if client window inactive"
-msgstr ""
+#: src/gui/setup_input.cpp:66
+msgid "Move Left"
+msgstr "向左移动"
 
-#: src/gui/setup_joystick.cpp:53
-msgid "Joystick"
-msgstr "游戏杆"
+#: src/gui/setup_input.cpp:70
+msgid "Move Right"
+msgstr "向右移动"
 
-#: src/gui/setup_joystick.cpp:122
-msgid "Stop"
-msgstr "停止"
+#: src/gui/setup_input.cpp:78
+msgid "Target & Attack"
+msgstr "对准并攻击"
 
-#: src/gui/setup_joystick.cpp:124
-msgid "Rotate the stick and don't press buttons"
-msgstr ""
+#: src/gui/setup_input.cpp:82
+msgid "Move to Target"
+msgstr "移动到目标"
 
-#: src/gui/setup_keyboard.cpp:80
-msgid "Keyboard"
-msgstr "键盘"
+#: src/gui/setup_input.cpp:86
+msgid "Change Move to Target type"
+msgstr "更改移动到目标类型"
 
-#: src/gui/setup_keyboard.cpp:89
-msgid "Assign"
-msgstr "分配"
+#: src/gui/setup_input.cpp:90
+msgid "Move to Home location"
+msgstr "移动到首页位置"
 
-#: src/gui/setup_keyboard.cpp:93
-msgid "Unassign"
-msgstr "取消分配"
+#: src/gui/setup_input.cpp:94
+msgid "Set home location"
+msgstr "设为首页位置"
 
-#: src/gui/setup_keyboard.cpp:97
-msgid "Default"
-msgstr "预设"
+#: src/gui/setup_input.cpp:98
+msgid "Move to navigation point"
+msgstr "移动导航点"
 
-#: src/gui/setup_keyboard.cpp:133
-msgid "Key Conflict(s) Detected."
-msgstr "检测到按键冲突。"
+#: src/gui/setup_input.cpp:106
+msgid "Stop Attack"
+msgstr "停止攻击"
 
-#: src/gui/setup_other.cpp:38
-msgid "Misc"
-msgstr "杂项"
+#: src/gui/setup_input.cpp:110
+msgid "Untarget"
+msgstr ""
 
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "怪物"
+#: src/gui/setup_input.cpp:114
+msgid "Target monster"
+msgstr ""
 
-#: src/gui/setup_other.cpp:46
-msgid "Show damage inflicted to monsters"
-msgstr "显示损坏造成的，以怪物"
+#: src/gui/setup_input.cpp:118
+msgid "Target NPC"
+msgstr "目标NPC"
 
-#: src/gui/setup_other.cpp:49
-msgid "Auto target only reachable monsters"
-msgstr "自动目标只有到达怪物"
+#: src/gui/setup_input.cpp:122
+msgid "Target Player"
+msgstr "目标玩家"
 
-#: src/gui/setup_other.cpp:52
-msgid "Highlight monster attack range"
-msgstr "突出显示怪物的攻击范围"
+#: src/gui/setup_input.cpp:126
+msgid "Pickup"
+msgstr "捡起"
 
-#: src/gui/setup_other.cpp:56
-msgid "Show monster hp bar"
-msgstr "显示怪物HP栏"
+#: src/gui/setup_input.cpp:130
+msgid "Change Pickup Type"
+msgstr "更改皮卡型"
 
-#: src/gui/setup_other.cpp:59
-msgid "Cycle monster targets"
-msgstr ""
+#: src/gui/setup_input.cpp:134
+msgid "Hide Windows"
+msgstr "隐藏窗口"
 
-#: src/gui/setup_other.cpp:65
-msgid "Show warps particles"
-msgstr ""
+#: src/gui/setup_input.cpp:138
+msgid "Sit"
+msgstr "坐下"
 
-#: src/gui/setup_other.cpp:68
-msgid "Highlight map portals"
-msgstr "突出显示的地图门户网站"
+#: src/gui/setup_input.cpp:142
+msgid "Screenshot"
+msgstr "屏幕快照"
 
-#: src/gui/setup_other.cpp:71
-msgid "Highlight floor items"
-msgstr "突出地板项目"
+#: src/gui/setup_input.cpp:146
+msgid "Enable/Disable Trading"
+msgstr "开启/关闭交易"
 
-#: src/gui/setup_other.cpp:74
-msgid "Highlight player attack range"
-msgstr "突出显示球员的攻击范围"
+#: src/gui/setup_input.cpp:150
+msgid "Change Map View Mode"
+msgstr "更改地图浏览模式"
 
-#: src/gui/setup_other.cpp:77
-msgid "Show extended minimaps"
-msgstr ""
+#: src/gui/setup_input.cpp:154
+msgid "Select OK"
+msgstr "选择OK"
 
-#: src/gui/setup_other.cpp:80
-msgid "Draw path"
-msgstr "绘制路径"
+#: src/gui/setup_input.cpp:162
+msgid "Shortcuts Keys"
+msgstr "快捷按键"
 
-#: src/gui/setup_other.cpp:83
-msgid "Draw hotkeys on map"
-msgstr ""
+#: src/gui/setup_input.cpp:166
+msgid "Item Shortcuts Key"
+msgstr "项目的快捷键"
 
-#: src/gui/setup_other.cpp:86
-msgid "Enable lazy scrolling"
-msgstr ""
+#: src/gui/setup_input.cpp:170 src/gui/setup_input.cpp:174
+#: src/gui/setup_input.cpp:178 src/gui/setup_input.cpp:182
+#: src/gui/setup_input.cpp:186 src/gui/setup_input.cpp:190
+#: src/gui/setup_input.cpp:194 src/gui/setup_input.cpp:198
+#: src/gui/setup_input.cpp:202 src/gui/setup_input.cpp:206
+#: src/gui/setup_input.cpp:210 src/gui/setup_input.cpp:214
+#: src/gui/setup_input.cpp:218 src/gui/setup_input.cpp:222
+#: src/gui/setup_input.cpp:226 src/gui/setup_input.cpp:230
+#: src/gui/setup_input.cpp:234 src/gui/setup_input.cpp:238
+#: src/gui/setup_input.cpp:242 src/gui/setup_input.cpp:246
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "物品快捷 %d"
 
-#: src/gui/setup_other.cpp:89
-msgid "Scroll laziness"
-msgstr ""
+#: src/gui/setup_input.cpp:250
+msgid "Windows Keys"
+msgstr "窗口按键"
 
-#: src/gui/setup_other.cpp:92
-msgid "Scroll radius"
-msgstr ""
+#: src/gui/setup_input.cpp:254
+msgid "Help Window"
+msgstr "帮助窗口"
 
-#: src/gui/setup_other.cpp:96
-msgid "Moving"
-msgstr "移动"
+#: src/gui/setup_input.cpp:258
+msgid "Status Window"
+msgstr "状态窗口"
 
-#: src/gui/setup_other.cpp:98
-msgid "Auto fix position"
-msgstr "自动修复的位置"
+#: src/gui/setup_input.cpp:262
+msgid "Inventory Window"
+msgstr "物品栏窗口"
 
-#: src/gui/setup_other.cpp:101
-msgid "Attack while moving"
-msgstr "攻击的同时移动"
+#: src/gui/setup_input.cpp:266
+msgid "Equipment Window"
+msgstr "装备窗口"
 
-#: src/gui/setup_other.cpp:104
-msgid "Sync player move"
-msgstr "同步播放移动"
+#: src/gui/setup_input.cpp:270
+msgid "Skill Window"
+msgstr "技能窗口"
 
-#: src/gui/setup_other.cpp:107
-msgid "Crazy move A program"
-msgstr "疯狂的举动的程序"
+#: src/gui/setup_input.cpp:274
+msgid "Minimap Window"
+msgstr "小地图窗口"
 
-#: src/gui/setup_other.cpp:111
-msgid "Player"
-msgstr "玩家"
+#: src/gui/setup_input.cpp:278
+msgid "Chat Window"
+msgstr "聊天窗口"
 
-#: src/gui/setup_other.cpp:113
-msgid "Show own hp bar"
-msgstr "显示自己的HP栏"
+#: src/gui/setup_input.cpp:282
+msgid "Item Shortcut Window"
+msgstr "物品快捷窗口"
 
-#: src/gui/setup_other.cpp:116
-msgid "Enable quick stats"
-msgstr "启用快速统计"
+#: src/gui/setup_input.cpp:286
+msgid "Setup Window"
+msgstr "设置窗口"
 
-#: src/gui/setup_other.cpp:119
-msgid "Cycle player targets"
-msgstr ""
+#: src/gui/setup_input.cpp:290
+msgid "Debug Window"
+msgstr "Debug窗口"
 
-#: src/gui/setup_other.cpp:122
-msgid "Show job exp messages"
-msgstr "显示工作EXP消息"
+#: src/gui/setup_input.cpp:294
+msgid "Social Window"
+msgstr "社会窗口"
 
-#: src/gui/setup_other.cpp:125
-msgid "Show players popups"
-msgstr "显示球员弹出窗口"
+#: src/gui/setup_input.cpp:298
+msgid "Emote Shortcut Window"
+msgstr "表情快捷窗口"
 
-#: src/gui/setup_other.cpp:128
-msgid "Afk message"
-msgstr ""
+#: src/gui/setup_input.cpp:302
+msgid "Outfits Window"
+msgstr "套装窗口"
 
-#: src/gui/setup_other.cpp:131
-msgid "Show job"
-msgstr "显示工作"
+#: src/gui/setup_input.cpp:306
+msgid "Shop Window"
+msgstr "橱窗"
 
-#: src/gui/setup_other.cpp:134
-msgid "Enable attack filter"
-msgstr "启用攻击过滤器"
+#: src/gui/setup_input.cpp:310
+msgid "Quick drop Window"
+msgstr "快速下拉窗口"
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
-msgstr ""
+#: src/gui/setup_input.cpp:314
+msgid "Kill Stats Window"
+msgstr "杀敌统计窗口"
 
-#: src/gui/setup_other.cpp:143
-msgid "Accept sell/buy requests"
-msgstr "接受出售/购买请求"
+#: src/gui/setup_input.cpp:318
+msgid "Commands Window"
+msgstr "命令的窗口"
 
-#: src/gui/setup_other.cpp:146
-msgid "Enable shop mode"
-msgstr "启用商店模式"
-
-#: src/gui/setup_other.cpp:152
-msgid "Log NPC dialogue"
-msgstr "NPC对话"
-
-#: src/gui/setup_other.cpp:156
-msgid "Bots support"
-msgstr "挂机支持"
+#: src/gui/setup_input.cpp:322
+msgid "Bot Checker Window"
+msgstr "挂机检查窗口"
 
-#: src/gui/setup_other.cpp:158
-msgid "Enable auction bot support"
-msgstr "启用拍卖挂机支持"
+#: src/gui/setup_input.cpp:326
+msgid "Who Is Online Window"
+msgstr "谁是在线窗口"
 
-#: src/gui/setup_other.cpp:161
-msgid "Enable guild bot support and disable native guild support"
-msgstr ""
+#: src/gui/setup_input.cpp:330
+msgid "Did you know Window"
+msgstr "你知道吗窗口"
 
-#: src/gui/setup_other.cpp:165
-msgid "Windows"
-msgstr ""
+#: src/gui/setup_input.cpp:334
+msgid "Previous Social Tab"
+msgstr "上一页社会标签"
 
-#: src/gui/setup_other.cpp:167
-msgid "Auto hide shortcuts buttons."
+#: src/gui/setup_input.cpp:338
+msgid "Next Social Tab"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
-msgid "Enable server side attack"
-msgstr "启用服务器端的攻击"
+#: src/gui/setup_input.cpp:342
+msgid "Emotes Keys"
+msgstr "表情按键"
 
-#: src/gui/setup_other.cpp:175
-msgid "Enable bot checker"
-msgstr "启用挂机检查"
+#: src/gui/setup_input.cpp:346
+msgid "Smilie"
+msgstr "笑脸"
 
-#: src/gui/setup_other.cpp:178
-msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+#: src/gui/setup_input.cpp:350 src/gui/setup_input.cpp:354
+#: src/gui/setup_input.cpp:358 src/gui/setup_input.cpp:362
+#: src/gui/setup_input.cpp:366 src/gui/setup_input.cpp:370
+#: src/gui/setup_input.cpp:374 src/gui/setup_input.cpp:378
+#: src/gui/setup_input.cpp:382 src/gui/setup_input.cpp:386
+#: src/gui/setup_input.cpp:390 src/gui/setup_input.cpp:394
+#: src/gui/setup_input.cpp:398 src/gui/setup_input.cpp:402
+#: src/gui/setup_input.cpp:406 src/gui/setup_input.cpp:410
+#: src/gui/setup_input.cpp:414 src/gui/setup_input.cpp:418
+#: src/gui/setup_input.cpp:422 src/gui/setup_input.cpp:426
+#: src/gui/setup_input.cpp:430 src/gui/setup_input.cpp:434
+#: src/gui/setup_input.cpp:438 src/gui/setup_input.cpp:442
+#: src/gui/setup_input.cpp:446 src/gui/setup_input.cpp:450
+#: src/gui/setup_input.cpp:454 src/gui/setup_input.cpp:458
+#: src/gui/setup_input.cpp:462 src/gui/setup_input.cpp:466
+#: src/gui/setup_input.cpp:470 src/gui/setup_input.cpp:474
+#: src/gui/setup_input.cpp:478 src/gui/setup_input.cpp:482
+#: src/gui/setup_input.cpp:486 src/gui/setup_input.cpp:490
+#: src/gui/setup_input.cpp:494 src/gui/setup_input.cpp:498
+#: src/gui/setup_input.cpp:502 src/gui/setup_input.cpp:506
+#: src/gui/setup_input.cpp:510 src/gui/setup_input.cpp:514
+#: src/gui/setup_input.cpp:518 src/gui/setup_input.cpp:522
+#: src/gui/setup_input.cpp:526 src/gui/setup_input.cpp:530
+#: src/gui/setup_input.cpp:534 src/gui/setup_input.cpp:538
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "表情快捷键为 %d"
 
-#: src/gui/setup_other.cpp:182
-msgid "Enable debug log"
-msgstr "启用调试日志"
+#: src/gui/setup_input.cpp:542
+msgid "Outfits Keys"
+msgstr "套装按键"
 
-#: src/gui/setup_other.cpp:185
-msgid "Low traffic mode"
-msgstr "低流量模式"
+#: src/gui/setup_input.cpp:546
+msgid "Wear Outfit"
+msgstr "装备套装"
 
-#: src/gui/setup_other.cpp:188
-msgid "Hide shield sprite"
+#: src/gui/setup_input.cpp:550
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/gui/setup_other.cpp:192
-msgid "Use FBO for screenshots (only for opengl)"
+#: src/gui/setup_input.cpp:554
+msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
-msgid "Show background"
-msgstr "显示背景"
+#: src/gui/setup_input.cpp:558
+msgid "Chat Keys"
+msgstr "聊天按键"
 
-#: src/gui/setup_perfomance.cpp:54
-msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
+#: src/gui/setup_input.cpp:562
+msgid "Toggle Chat"
+msgstr "切换聊天"
 
-#: src/gui/setup_perfomance.cpp:57
-msgid "Auto adjust perfomance"
-msgstr "自动调整"
+#: src/gui/setup_input.cpp:566
+msgid "Scroll Chat Up"
+msgstr "向上滚动聊天记录"
 
-#: src/gui/setup_perfomance.cpp:60
-msgid "Hw acceleration"
-msgstr "硬件加速"
+#: src/gui/setup_input.cpp:570
+msgid "Scroll Chat Down"
+msgstr "向下滚动聊天记录"
 
-#: src/gui/setup_perfomance.cpp:63
-msgid "Enable opacity cache (Software, can use many memory)"
-msgstr ""
+#: src/gui/setup_input.cpp:574
+msgid "Previous Chat Tab"
+msgstr "上一个聊天窗口标签页"
 
-#: src/gui/setup_perfomance.cpp:66
-msgid "Enable map reduce (Software)"
-msgstr ""
+#: src/gui/setup_input.cpp:578
+msgid "Next Chat Tab"
+msgstr "下一个聊天窗口标签页"
 
-#: src/gui/setup_perfomance.cpp:69
-msgid "Better quality (disable for better perfomance)"
-msgstr ""
+#: src/gui/setup_input.cpp:582
+msgid "Close current Chat Tab"
+msgstr "关闭当前聊天标签"
 
-#: src/gui/setup_perfomance.cpp:72
-msgid "Enable alpha channel fix (Software, can be very slow)"
+#: src/gui/setup_input.cpp:586
+msgid "Previous chat line"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
-msgid "Show beings transparency"
+#: src/gui/setup_input.cpp:590
+msgid "Next chat line"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:79
-msgid "Enable reorder sprites."
-msgstr ""
+#: src/gui/setup_input.cpp:594
+msgid "Chat Auto Complete"
+msgstr "自动完成交谈"
 
-#: src/gui/setup_perfomance.cpp:82
-msgid "Small memory (enable for lower memory usage)"
-msgstr ""
+#: src/gui/setup_input.cpp:598
+msgid "Deactivate Chat Input"
+msgstr "停用聊天输入"
 
-#: src/gui/setup_perfomance.cpp:85
-msgid "Disable advanced beings caching (Software)"
-msgstr ""
+#: src/gui/setup_input.cpp:602
+msgid "Other Keys"
+msgstr "其他按键"
 
-#: src/gui/setup_perfomance.cpp:88
-msgid "Disable beings caching (Software)"
-msgstr ""
+#: src/gui/setup_input.cpp:606
+msgid "Ignore input 1"
+msgstr "忽略输入1"
 
-#: src/gui/setup_players.cpp:53
-msgid "Show gender"
-msgstr "显示性别"
+#: src/gui/setup_input.cpp:610
+msgid "Ignore input 2"
+msgstr "忽略输入2"
 
-#: src/gui/setup_players.cpp:56
-msgid "Show level"
-msgstr "显示水平"
+#: src/gui/setup_input.cpp:614
+msgid "Direct Up"
+msgstr "直接向上"
 
-#: src/gui/setup_players.cpp:59
-msgid "Show own name"
-msgstr "显示自己的名字"
+#: src/gui/setup_input.cpp:618
+msgid "Direct Down"
+msgstr "直接下"
 
-#: src/gui/setup_players.cpp:62
-msgid "Enable extended mouse targeting"
-msgstr ""
+#: src/gui/setup_input.cpp:622
+msgid "Direct Left"
+msgstr "直接离开"
 
-#: src/gui/setup_players.cpp:65
-msgid "Target dead players"
-msgstr "目标死球员"
+#: src/gui/setup_input.cpp:626
+msgid "Direct Right"
+msgstr "直接对"
 
-#: src/gui/setup_players.cpp:68
-msgid "Visible names"
-msgstr "可见姓名"
+#: src/gui/setup_input.cpp:630
+msgid "Crazy moves"
+msgstr "疯狂移动"
 
-#: src/gui/setup_players.cpp:71
-msgid "Secure trades"
-msgstr ""
+#: src/gui/setup_input.cpp:634
+msgid "Change Crazy Move mode"
+msgstr "更改疯狂移动模式"
 
-#: src/gui/setup_players.cpp:74
-msgid "Unsecure chars in names"
+#: src/gui/setup_input.cpp:638
+msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/gui/setup_players.cpp:77
-msgid "Show statuses"
-msgstr "显示状态"
+#: src/gui/setup_input.cpp:642
+msgid "Quick Drop N Items"
+msgstr "快速下降序号项目"
 
-#: src/gui/setup_players.cpp:80
-msgid "Show ip addresses on screenshots"
+#: src/gui/setup_input.cpp:646
+msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/gui/setup_players.cpp:83
-msgid "Allow self heal with mouse click"
-msgstr ""
+#: src/gui/setup_input.cpp:650
+msgid "Quick heal target or self"
+msgstr "快速愈合的目标或自我"
 
-#: src/gui/setup_players.cpp:86
-msgid "Group friends in who is online window"
+#: src/gui/setup_input.cpp:654
+msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:63
-msgid "Relation"
-msgstr "关系"
+#: src/gui/setup_input.cpp:658
+msgid "Use magic attack"
+msgstr "使用魔法攻击"
 
-#: src/gui/setup_relations.cpp:68
-msgid "Neutral"
-msgstr "中立"
+#: src/gui/setup_input.cpp:662
+msgid "Switch magic attack"
+msgstr "切换魔法攻击"
 
-#: src/gui/setup_relations.cpp:69
-msgid "Friend"
-msgstr "好友"
+#: src/gui/setup_input.cpp:666
+msgid "Switch pvp attack"
+msgstr ""
 
-#: src/gui/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "被忽视的"
+#: src/gui/setup_input.cpp:670
+msgid "Change move type"
+msgstr "更改移动类型"
 
-#: src/gui/setup_relations.cpp:71
-msgid "Ignored"
-msgstr "忽略"
+#: src/gui/setup_input.cpp:674
+msgid "Change Attack Weapon Type"
+msgstr "更改攻击型武器"
 
-#: src/gui/setup_relations.cpp:72
-msgid "Erased"
-msgstr "已删除"
+#: src/gui/setup_input.cpp:678
+msgid "Change Attack Type"
+msgstr "更改攻击类型"
 
-#: src/gui/setup_relations.cpp:73
-msgid "Blacklisted"
-msgstr ""
+#: src/gui/setup_input.cpp:682
+msgid "Change Follow mode"
+msgstr "更改跟随模式"
 
-#: src/gui/setup_relations.cpp:74
-msgid "Enemy"
+#: src/gui/setup_input.cpp:686
+msgid "Change Imitation mode"
+msgstr "更改仿模式"
+
+#: src/gui/setup_input.cpp:690
+msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:242
-msgid "Allow trading"
-msgstr "允许交易"
+#: src/gui/setup_input.cpp:694
+msgid "On / Off audio"
+msgstr "开/关 音频"
 
-#: src/gui/setup_relations.cpp:244
-msgid "Allow whispers"
-msgstr "允许密语"
+#: src/gui/setup_input.cpp:698
+msgid "Enable / Disable away mode"
+msgstr "启用/禁用离开模式"
 
-#: src/gui/setup_relations.cpp:247
-msgid "Old"
-msgstr "旧"
+#: src/gui/setup_input.cpp:702
+msgid "Emulate right click from keyboard"
+msgstr "从键盘模拟右键单击"
 
-#: src/gui/setup_relations.cpp:249
-msgid "Relations"
-msgstr "关系"
+#: src/gui/setup_input.cpp:706
+msgid "Toggle camera mode"
+msgstr "切换模式"
 
-#: src/gui/setup_relations.cpp:271
-msgid "When ignoring:"
-msgstr "当忽略时："
+#: src/gui/setup_input.cpp:710
+msgid "Modifier key"
+msgstr "修改按键"
 
-#: src/gui/setup_theme.cpp:82
-msgid "Tiny (10)"
-msgstr "小（10）"
+#: src/gui/setup_input.cpp:752
+msgid "Input"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:83
-msgid "Small (11)"
-msgstr "小 (11)"
+#: src/gui/setup_input.cpp:761
+msgid "Assign"
+msgstr "分配"
 
-#: src/gui/setup_theme.cpp:84
-msgid "Medium (12)"
-msgstr "中 (12)"
+#: src/gui/setup_input.cpp:765
+msgid "Unassign"
+msgstr "取消分配"
 
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
-msgstr "大 (13)"
+#: src/gui/setup_input.cpp:769
+msgid "Default"
+msgstr "预设"
 
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
-msgstr "大(14)"
-
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
-msgstr "巨大的 (15)"
+#: src/gui/setup_input.cpp:809
+msgid "Key Conflict(s) Detected."
+msgstr "检测到按键冲突。"
 
-#: src/gui/setup_theme.cpp:120
-msgid "Chinese (China)"
+#: src/gui/setup_input.cpp:810
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/gui/setup_theme.cpp:121
-msgid "Czech"
-msgstr ""
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
+msgid "Press the button to start calibration"
+msgstr "按下开始校准按钮"
 
-#: src/gui/setup_theme.cpp:122
-msgid "English"
-msgstr ""
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
+msgid "Calibrate"
+msgstr "校准"
 
-#: src/gui/setup_theme.cpp:123
-msgid "Finnish"
-msgstr ""
+#: src/gui/setup_joystick.cpp:47
+msgid "Enable joystick"
+msgstr "启用游戏杆"
 
-#: src/gui/setup_theme.cpp:124
-msgid "French"
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:125
-msgid "German"
-msgstr ""
+#: src/gui/setup_joystick.cpp:53
+msgid "Joystick"
+msgstr "游戏杆"
 
-#: src/gui/setup_theme.cpp:126
-msgid "Indonesian"
-msgstr ""
+#: src/gui/setup_joystick.cpp:122
+msgid "Stop"
+msgstr "停止"
 
-#: src/gui/setup_theme.cpp:127
-msgid "Polish"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:128
-msgid "Japanese"
-msgstr ""
+#: src/gui/setup_other.cpp:38
+msgid "Misc"
+msgstr "杂项"
 
-#: src/gui/setup_theme.cpp:129
-msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "怪物"
 
-#: src/gui/setup_theme.cpp:130
-msgid "Portuguese"
-msgstr ""
+#: src/gui/setup_other.cpp:46
+msgid "Show damage inflicted to monsters"
+msgstr "显示损坏造成的，以怪物"
 
-#: src/gui/setup_theme.cpp:131
-msgid "Portuguese (Brazilian)"
-msgstr ""
+#: src/gui/setup_other.cpp:49
+msgid "Auto target only reachable monsters"
+msgstr "自动目标只有到达怪物"
 
-#: src/gui/setup_theme.cpp:132
-msgid "Russian"
+#: src/gui/setup_other.cpp:52
+msgid "Highlight monster attack range"
+msgstr "突出显示怪物的攻击范围"
+
+#: src/gui/setup_other.cpp:56
+msgid "Show monster hp bar"
+msgstr "显示怪物HP栏"
+
+#: src/gui/setup_other.cpp:59
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:133
-msgid "Spanish (Castilian)"
+#: src/gui/setup_other.cpp:65
+msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:165
-msgid "Theme"
-msgstr "主题"
+#: src/gui/setup_other.cpp:68
+msgid "Highlight map portals"
+msgstr "突出显示的地图门户网站"
 
-#: src/gui/setup_theme.cpp:167
-msgid "Gui theme"
-msgstr "桂主题"
+#: src/gui/setup_other.cpp:71
+msgid "Highlight floor items"
+msgstr "突出地板项目"
 
-#: src/gui/setup_theme.cpp:168
-msgid "Language"
-msgstr ""
+#: src/gui/setup_other.cpp:74
+msgid "Highlight player attack range"
+msgstr "突出显示球员的攻击范围"
 
-#: src/gui/setup_theme.cpp:169
-msgid "Main Font"
-msgstr "主要字体"
+#: src/gui/setup_other.cpp:77
+msgid "Show extended minimaps"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:170
-msgid "Bold font"
-msgstr "加粗字体"
+#: src/gui/setup_other.cpp:80
+msgid "Draw path"
+msgstr "绘制路径"
 
-#: src/gui/setup_theme.cpp:171
-msgid "Particle font"
-msgstr "粒子字体"
+#: src/gui/setup_other.cpp:83
+msgid "Draw hotkeys on map"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:172
-msgid "Help font"
-msgstr "帮助字体"
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:173
-msgid "Secure font"
-msgstr "安全字体"
+#: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:174
-msgid "Japanese font"
-msgstr "日文字体"
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:211
-msgid "Font size"
-msgstr "字体大小"
+#: src/gui/setup_other.cpp:96
+msgid "Moving"
+msgstr "移动"
 
-#: src/gui/setup_theme.cpp:352
-msgid "Theme Changed"
-msgstr "主题更改"
+#: src/gui/setup_other.cpp:98
+msgid "Auto fix position"
+msgstr "自动修复的位置"
 
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
-#: src/gui/setup_video.cpp:508
-msgid "Restart your client for the change to take effect."
-msgstr "重启您的游戏客户端以使变更生效。"
+#: src/gui/setup_other.cpp:101
+msgid "Attack while moving"
+msgstr "攻击的同时移动"
 
-#: src/gui/setup_video.cpp:192
-msgid "Software"
-msgstr "软件"
+#: src/gui/setup_other.cpp:104
+msgid "Sync player move"
+msgstr "同步播放移动"
 
-#: src/gui/setup_video.cpp:193
-msgid "Fast OpenGL"
-msgstr "快速的OpenGL"
+#: src/gui/setup_other.cpp:107
+msgid "Crazy move A program"
+msgstr "疯狂的举动的程序"
 
-#: src/gui/setup_video.cpp:194
-msgid "Safe OpenGL"
-msgstr "安全的OpenGL"
+#: src/gui/setup_other.cpp:111
+msgid "Player"
+msgstr "玩家"
 
-#: src/gui/setup_video.cpp:225
-msgid "Full screen"
-msgstr "全屏"
+#: src/gui/setup_other.cpp:113
+msgid "Show own hp bar"
+msgstr "显示自己的HP栏"
 
-#: src/gui/setup_video.cpp:226
-msgid "Custom cursor"
-msgstr "自定义鼠标"
+#: src/gui/setup_other.cpp:116
+msgid "Enable quick stats"
+msgstr "启用快速统计"
 
-#: src/gui/setup_video.cpp:228
-msgid "Enable resize"
+#: src/gui/setup_other.cpp:119
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "No frame"
-msgstr ""
+#: src/gui/setup_other.cpp:122
+msgid "Show job exp messages"
+msgstr "显示工作EXP消息"
 
-#: src/gui/setup_video.cpp:230
-msgid "FPS limit:"
-msgstr "FPS限制："
+#: src/gui/setup_other.cpp:125
+msgid "Show players popups"
+msgstr "显示球员弹出窗口"
 
-#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
-#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
-msgid "Alt FPS limit: "
+#: src/gui/setup_other.cpp:128
+msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
-#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
-#: src/gui/setup_video.cpp:549
-msgid "None"
-msgstr "w"
+#: src/gui/setup_other.cpp:131
+msgid "Show job"
+msgstr "显示工作"
 
-#: src/gui/setup_video.cpp:376
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
+#: src/gui/setup_other.cpp:134
+msgid "Enable attack filter"
+msgstr "启用攻击过滤器"
 
-#: src/gui/setup_video.cpp:382
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_other.cpp:137
+msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_video.cpp:393
-msgid "Switching to Full Screen"
-msgstr "切换到全屏"
+#: src/gui/setup_other.cpp:143
+msgid "Accept sell/buy requests"
+msgstr "接受出售/购买请求"
 
-#: src/gui/setup_video.cpp:394
-msgid "Restart needed for changes to take effect."
-msgstr "重启生效"
+#: src/gui/setup_other.cpp:146
+msgid "Enable shop mode"
+msgstr "启用商店模式"
 
-#: src/gui/setup_video.cpp:406
-msgid "Changing to OpenGL"
-msgstr "切换到OpenGL"
+#: src/gui/setup_other.cpp:152
+msgid "Log NPC dialogue"
+msgstr "NPC对话"
 
-#: src/gui/setup_video.cpp:407
-msgid "Applying change to OpenGL requires restart."
-msgstr "运用改变为OpenGL需要重新开始"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr "挂机支持"
 
-#: src/gui/setup_video.cpp:482
-msgid "Custom resolution (example: 1024x768)"
-msgstr "自定义分辨率 (例如: 1024x768)"
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr "启用拍卖挂机支持"
 
-#: src/gui/setup_video.cpp:483
-msgid "Enter new resolution:                "
-msgstr "输入新的分辨率:"
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
 
-#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
-msgid "Screen Resolution Changed"
-msgstr "屏幕分辨率已更改"
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_other.cpp:168
+msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:35
-msgid "Visual"
+#: src/gui/setup_other.cpp:169
+msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:43
-msgid "Notifications"
+#: src/gui/setup_other.cpp:170
+msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:45
-msgid "Show pickup notifications in chat"
+#: src/gui/setup_other.cpp:171
+msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:48
-msgid "Show pickup notifications as particle effects"
+#: src/gui/setup_other.cpp:175
+msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:51
-msgid "Effects"
+#: src/gui/setup_other.cpp:178
+msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:53
-msgid "Grab mouse and keyboard input"
+#: src/gui/setup_other.cpp:179
+msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:56
-msgid "Gui opacity"
-msgstr "Gui 透明度"
+#: src/gui/setup_other.cpp:185
+msgid "SOCKS5 hostname"
+msgstr ""
 
-#: src/gui/setup_visual.cpp:60
-msgid "No text"
-msgstr "无文本"
+#: src/gui/setup_other.cpp:186
+msgid "Proxy type"
+msgstr ""
 
-#: src/gui/setup_visual.cpp:61
-msgid "Text"
-msgstr "文本"
+#: src/gui/setup_other.cpp:189
+msgid "Proxy address:port"
+msgstr ""
 
-#: src/gui/setup_visual.cpp:62
-msgid "Bubbles, no names"
-msgstr "气泡，无名"
+#: src/gui/setup_other.cpp:195
+msgid "Enable server side attack"
+msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_visual.cpp:63
-msgid "Bubbles with names"
-msgstr "有名气泡"
+#: src/gui/setup_other.cpp:198
+msgid "Enable bot checker"
+msgstr "启用挂机检查"
 
-#: src/gui/setup_visual.cpp:64
-msgid "Overhead text"
-msgstr "头顶文字"
+#: src/gui/setup_other.cpp:201
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
 
-#: src/gui/setup_visual.cpp:68 src/gui/setup_visual.cpp:93
-msgid "off"
-msgstr "关闭"
+#: src/gui/setup_other.cpp:205
+msgid "Enable debug log"
+msgstr "启用调试日志"
 
-#: src/gui/setup_visual.cpp:69 src/gui/setup_visual.cpp:78
-msgid "low"
-msgstr "低"
+#: src/gui/setup_other.cpp:208
+msgid "Low traffic mode"
+msgstr "低流量模式"
 
-#: src/gui/setup_visual.cpp:70 src/gui/setup_visual.cpp:80
-msgid "high"
-msgstr "高"
+#: src/gui/setup_other.cpp:211
+msgid "Hide shield sprite"
+msgstr ""
 
-#: src/gui/setup_visual.cpp:71
-msgid "Ambient FX"
-msgstr "环境音效"
+#: src/gui/setup_other.cpp:215
+msgid "Use FBO for screenshots (only for opengl)"
+msgstr ""
 
-#: src/gui/setup_visual.cpp:74
-msgid "Particle effects"
-msgstr "粒子效果"
+#: src/gui/setup_other.cpp:219
+msgid "Show background"
+msgstr "显示背景"
 
-#: src/gui/setup_visual.cpp:79
-msgid "medium"
-msgstr "中"
+#: src/gui/setup_perfomance.cpp:54
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_visual.cpp:81
-msgid "max"
-msgstr "最大"
+#: src/gui/setup_perfomance.cpp:57
+msgid "Auto adjust perfomance"
+msgstr "自动调整"
 
-#: src/gui/setup_visual.cpp:82
-msgid "Particle detail"
-msgstr "l"
+#: src/gui/setup_perfomance.cpp:60
+msgid "Hw acceleration"
+msgstr "硬件加速"
 
-#: src/gui/setup_visual.cpp:88
-msgid "Gamma"
+#: src/gui/setup_perfomance.cpp:63
+msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:94
-msgid "on"
+#: src/gui/setup_perfomance.cpp:66
+msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_visual.cpp:95
-msgid "Vsync"
+#: src/gui/setup_perfomance.cpp:69
+msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:76
-msgid "Personal Shop"
-msgstr "个人商店"
+#: src/gui/setup_perfomance.cpp:72
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:119
-msgid "Buy items"
-msgstr "购买物品"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:120
-msgid "Sell items"
-msgstr "出售物品"
+#: src/gui/setup_perfomance.cpp:79
+msgid "Enable reorder sprites."
+msgstr ""
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
-msgid "Announce"
-msgstr "公布"
+#: src/gui/setup_perfomance.cpp:82
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:128
-msgid "Show links in announce"
-msgstr "显示在公布的联系"
+#: src/gui/setup_perfomance.cpp:85
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
-msgid "Auction"
-msgstr "拍卖"
+#: src/gui/setup_perfomance.cpp:88
+msgid "Disable beings caching (Software)"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
-msgid "Request for Trade"
-msgstr "请求交易"
+#: src/gui/setup_players.cpp:53
+msgid "Show gender"
+msgstr "显示性别"
 
-#: src/gui/shopwindow.cpp:762
-#, c-format
-msgid "%s wants to %s %s do you accept?"
-msgstr "%s想要%s %s 你接受吗？"
+#: src/gui/setup_players.cpp:56
+msgid "Show level"
+msgstr "显示水平"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
-msgid "Skills"
-msgstr "技能"
+#: src/gui/setup_players.cpp:59
+msgid "Show own name"
+msgstr "显示自己的名字"
 
-#: src/gui/skilldialog.cpp:244
-msgid "Up"
-msgstr "升级"
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:337
-#, c-format
-msgid "Skill points available: %d"
-msgstr "技能点：%d个"
+#: src/gui/setup_players.cpp:65
+msgid "Target dead players"
+msgstr "目标死球员"
 
-#: src/gui/skilldialog.cpp:381
-msgid "basic"
-msgstr ""
+#: src/gui/setup_players.cpp:68
+msgid "Visible names"
+msgstr "可见姓名"
 
-#: src/gui/skilldialog.cpp:382
-msgid "Skill: basic, Id: 1"
+#: src/gui/setup_players.cpp:71
+msgid "Secure trades"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:419
-#, c-format
-msgid "Skill Set %d"
+#: src/gui/setup_players.cpp:74
+msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:431
-#, c-format
-msgid "Skill %d"
-msgstr "技能为%d"
+#: src/gui/setup_players.cpp:77
+msgid "Show statuses"
+msgstr "显示状态"
 
-#: src/gui/skilldialog.cpp:437
-#, c-format
-msgid "Skill: %s, Id: %d"
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:507 src/gui/skilldialog.cpp:595
-#, c-format
-msgid "Lvl: %d"
-msgstr "等级: %d"
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:587
-#, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "等级: %d（%+d）"
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
-msgid "Guild"
-msgstr "帮会"
+#: src/gui/setup_relations.cpp:63
+msgid "Relation"
+msgstr "关系"
 
-#: src/gui/socialwindow.cpp:174
-#, c-format
-msgid "Invited user %s to guild %s."
-msgstr "邀请用户%s加入公会%s"
+#: src/gui/setup_relations.cpp:68
+msgid "Neutral"
+msgstr "中立"
 
-#: src/gui/socialwindow.cpp:188
-#, c-format
-msgid "Guild %s quit requested."
-msgstr "退出公会%s的请求。"
+#: src/gui/setup_relations.cpp:69
+msgid "Friend"
+msgstr "好友"
 
-#: src/gui/socialwindow.cpp:215
-msgid "Member Invite to Guild"
-msgstr "会员邀请到公会"
+#: src/gui/setup_relations.cpp:70
+msgid "Disregarded"
+msgstr "被忽视的"
 
-#: src/gui/socialwindow.cpp:216
-#, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr "你要邀请谁加入工会%s?"
+#: src/gui/setup_relations.cpp:71
+msgid "Ignored"
+msgstr "忽略"
 
-#: src/gui/socialwindow.cpp:225
-msgid "Leave Guild?"
-msgstr "离开公会？"
+#: src/gui/setup_relations.cpp:72
+msgid "Erased"
+msgstr "已删除"
 
-#: src/gui/socialwindow.cpp:226
-#, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "你确定要离开工会%s吗？"
+#: src/gui/setup_relations.cpp:73
+msgid "Blacklisted"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
-msgid "Party"
-msgstr "t"
+#: src/gui/setup_relations.cpp:74
+msgid "Enemy"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:374
-#, c-format
-msgid "Invited user %s to party."
-msgstr "邀请用户%s加入团队."
+#: src/gui/setup_relations.cpp:242
+msgid "Allow trading"
+msgstr "允许交易"
 
-#: src/gui/socialwindow.cpp:388
-#, c-format
-msgid "Party %s quit requested."
-msgstr ""
+#: src/gui/setup_relations.cpp:244
+msgid "Allow whispers"
+msgstr "允许密语"
 
-#: src/gui/socialwindow.cpp:415
-msgid "Member Invite to Party"
-msgstr ""
+#: src/gui/setup_relations.cpp:247
+msgid "Old"
+msgstr "旧"
 
-#: src/gui/socialwindow.cpp:416
-#, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr ""
+#: src/gui/setup_relations.cpp:249
+msgid "Relations"
+msgstr "关系"
 
-#: src/gui/socialwindow.cpp:425
-msgid "Leave Party?"
-msgstr "离开团队?"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "当忽略时："
 
-#: src/gui/socialwindow.cpp:426
-#, c-format
-msgid "Are you sure you want to leave party %s?"
+#: src/gui/setup_theme.cpp:82
+msgid "Tiny (10)"
+msgstr "小（10）"
+
+#: src/gui/setup_theme.cpp:83
+msgid "Small (11)"
+msgstr "小 (11)"
+
+#: src/gui/setup_theme.cpp:84
+msgid "Medium (12)"
+msgstr "中 (12)"
+
+#: src/gui/setup_theme.cpp:85
+msgid "Large (13)"
+msgstr "大 (13)"
+
+#: src/gui/setup_theme.cpp:86
+msgid "Big (14)"
+msgstr "大(14)"
+
+#: src/gui/setup_theme.cpp:87
+msgid "Huge (15)"
+msgstr "巨大的 (15)"
+
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:650
-msgid "Nav"
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:928
-msgid "Atk"
+#: src/gui/setup_theme.cpp:122
+msgid "English"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:969
-msgid "Priority mobs"
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1001
-msgid "Attack mobs"
-msgstr "攻击暴徒"
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:1036
-msgid "Ignore mobs"
+#: src/gui/setup_theme.cpp:125
+msgid "German"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1196
-msgid "Create Guild"
-msgstr "创建帮会"
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
-msgid "Create Party"
-msgstr "建立"
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
-msgid "Social"
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1262
-msgid "Invite"
-msgstr "邀请"
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
 
-#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1278
-msgid "P"
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
 msgstr ""
 
-#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1282
-msgid "F"
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1415
-#, c-format
-msgid "Accepted party invite from %s."
-msgstr "接受%s团队的邀请."
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
-#, c-format
-msgid "Rejected party invite from %s."
-msgstr "拒绝%s的团队邀请."
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:1442
-#, c-format
-msgid "Accepted guild invite from %s."
-msgstr "已接受公会邀请来自%s."
+#: src/gui/setup_theme.cpp:165
+msgid "Theme"
+msgstr "主题"
 
-#: src/gui/socialwindow.cpp:1455
-#, c-format
-msgid "Rejected guild invite from %s."
-msgstr "拒绝%s的公会邀请."
+#: src/gui/setup_theme.cpp:167
+msgid "Gui theme"
+msgstr "桂主题"
 
-#: src/gui/socialwindow.cpp:1502
-#, c-format
-msgid "Creating guild called %s."
-msgstr "创建公会的名为%s"
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:1525
-#, c-format
-msgid "Creating party called %s."
-msgstr "创建团队名字为%s的"
+#: src/gui/setup_theme.cpp:169
+msgid "Main Font"
+msgstr "主要字体"
 
-#: src/gui/socialwindow.cpp:1539
-msgid "Guild Name"
-msgstr "公会名称"
+#: src/gui/setup_theme.cpp:170
+msgid "Bold font"
+msgstr "加粗字体"
 
-#: src/gui/socialwindow.cpp:1540
-msgid "Choose your guild's name."
-msgstr "选择你的公会的名字."
+#: src/gui/setup_theme.cpp:171
+msgid "Particle font"
+msgstr "粒子字体"
 
-#: src/gui/socialwindow.cpp:1554
-msgid "Received guild request, but one already exists."
-msgstr ""
+#: src/gui/setup_theme.cpp:172
+msgid "Help font"
+msgstr "帮助字体"
 
-#: src/gui/socialwindow.cpp:1560
-#, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s邀请你加入公会%s"
+#: src/gui/setup_theme.cpp:173
+msgid "Secure font"
+msgstr "安全字体"
 
-#: src/gui/socialwindow.cpp:1566
-msgid "Accept Guild Invite"
-msgstr "接受邀请"
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr "日文字体"
 
-#: src/gui/socialwindow.cpp:1581
-msgid "Received party request, but one already exists."
-msgstr "接受到一个已经存在的帮会邀请。"
+#: src/gui/setup_theme.cpp:211
+msgid "Font size"
+msgstr "字体大小"
 
-#: src/gui/socialwindow.cpp:1592
-msgid "You have been invited you to join a party."
-msgstr "您已被邀请您加入党。"
+#: src/gui/setup_theme.cpp:352
+msgid "Theme Changed"
+msgstr "主题更改"
 
-#: src/gui/socialwindow.cpp:1596
-#, c-format
-msgid "You have been invited to join the %s party."
-msgstr "您已被邀请加入%s的团队。"
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
+msgid "Restart your client for the change to take effect."
+msgstr "重启您的游戏客户端以使变更生效。"
 
-#: src/gui/socialwindow.cpp:1604
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s已经邀请你加入他们的帮会。"
+#: src/gui/setup_video.cpp:192
+msgid "Software"
+msgstr "软件"
 
-#: src/gui/socialwindow.cpp:1609
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s已经邀请你加入帮会%s。"
+#: src/gui/setup_video.cpp:193
+msgid "Fast OpenGL"
+msgstr "快速的OpenGL"
 
-#: src/gui/socialwindow.cpp:1618
-msgid "Accept Party Invite"
-msgstr "接受帮会邀请"
+#: src/gui/setup_video.cpp:194
+msgid "Safe OpenGL"
+msgstr "安全的OpenGL"
 
-#: src/gui/socialwindow.cpp:1633
-msgid "Cannot create party. You are already in a party"
-msgstr "无法建立团队.您已经在一个队伍中了"
+#: src/gui/setup_video.cpp:225
+msgid "Full screen"
+msgstr "全屏"
 
-#: src/gui/socialwindow.cpp:1638
-msgid "Party Name"
+#: src/gui/setup_video.cpp:226
+msgid "Custom cursor"
+msgstr "自定义鼠标"
+
+#: src/gui/setup_video.cpp:228
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1639
-msgid "Choose your party's name."
-msgstr "选择n的名称。"
+#: src/gui/setup_video.cpp:229
+msgid "No frame"
+msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
-msgid "Specials"
-msgstr "特价商品"
+#: src/gui/setup_video.cpp:230
+msgid "FPS limit:"
+msgstr "FPS限制："
 
-#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
-#: src/gui/statuswindow.cpp:343
-#, c-format
-msgid "Level: %d"
-msgstr "等级：%d"
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
+msgid "Alt FPS limit: "
+msgstr ""
 
-#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
-#: src/gui/statuswindow.cpp:310
-#, c-format
-msgid "Money: %s"
-msgstr "金币: %s"
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
+msgid "None"
+msgstr "w"
 
-#: src/gui/statuswindow.cpp:157
-msgid "HP:"
-msgstr "HP："
+#: src/gui/setup_video.cpp:376
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
 
-#: src/gui/statuswindow.cpp:164
-msgid "Exp:"
-msgstr "经验："
+#: src/gui/setup_video.cpp:382
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:178
-msgid "MP:"
-msgstr "MP："
+#: src/gui/setup_video.cpp:393
+msgid "Switching to Full Screen"
+msgstr "切换到全屏"
 
-#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
-#, c-format
-msgid "Job: %d"
-msgstr "职业：%d"
+#: src/gui/setup_video.cpp:394
+msgid "Restart needed for changes to take effect."
+msgstr "重启生效"
 
-#: src/gui/statuswindow.cpp:211
-msgid "Job:"
-msgstr "职业："
+#: src/gui/setup_video.cpp:406
+msgid "Changing to OpenGL"
+msgstr "切换到OpenGL"
 
-#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
-#, c-format
-msgid "Character points: %d"
-msgstr "角色可用点: %d"
+#: src/gui/setup_video.cpp:407
+msgid "Applying change to OpenGL requires restart."
+msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/statuswindow.cpp:275
-#, c-format
-msgid "Level: %d (GM %d)"
-msgstr "级别:%d (GM %d)"
+#: src/gui/setup_video.cpp:482
+msgid "Custom resolution (example: 1024x768)"
+msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/statuswindow.cpp:331
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
+#: src/gui/setup_video.cpp:483
+msgid "Enter new resolution:                "
+msgstr "输入新的分辨率:"
 
-#: src/gui/textcommandeditor.cpp:111
-msgid "No Target"
-msgstr "没有目标"
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
+msgid "Screen Resolution Changed"
+msgstr "屏幕分辨率已更改"
 
-#: src/gui/textcommandeditor.cpp:112
-msgid "Allow Target"
+#: src/gui/setup_video.cpp:502
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
-msgid "Need Target"
+#: src/gui/setup_visual.cpp:35
+msgid "Visual"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:118
-msgid "General Magic"
+#: src/gui/setup_visual.cpp:43
+msgid "Notifications"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
-msgid "Life Magic"
-msgstr "生活魔术"
-
-#: src/gui/textcommandeditor.cpp:120
-msgid "War Magic"
-msgstr "战魔"
+#: src/gui/setup_visual.cpp:45
+msgid "Show pickup notifications in chat"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
-msgid "Transmute Magic"
-msgstr "蜕变魔术"
+#: src/gui/setup_visual.cpp:48
+msgid "Show pickup notifications as particle effects"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
-msgid "Nature Magic"
-msgstr "大自然的神奇"
+#: src/gui/setup_visual.cpp:51
+msgid "Effects"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
-msgid "Astral Magic"
-msgstr "星芒魔术"
+#: src/gui/setup_visual.cpp:53
+msgid "Grab mouse and keyboard input"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
-msgid "Command Editor"
-msgstr "命令编辑器"
+#: src/gui/setup_visual.cpp:56
+msgid "Blurring textures (OpenGL)"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
-msgid "magic"
-msgstr "魔术"
+#: src/gui/setup_visual.cpp:59
+msgid "Gui opacity"
+msgstr "Gui 透明度"
 
-#: src/gui/textcommandeditor.cpp:189
-msgid "other"
-msgstr "其他"
+#: src/gui/setup_visual.cpp:63
+msgid "No text"
+msgstr "无文本"
 
-#: src/gui/textcommandeditor.cpp:194
-msgid "Symbol:"
-msgstr "符号："
+#: src/gui/setup_visual.cpp:64
+msgid "Text"
+msgstr "文本"
 
-#: src/gui/textcommandeditor.cpp:197
-msgid "Command:"
-msgstr "命令："
+#: src/gui/setup_visual.cpp:65
+msgid "Bubbles, no names"
+msgstr "气泡，无名"
 
-#: src/gui/textcommandeditor.cpp:200
-msgid "Comment:"
-msgstr ""
+#: src/gui/setup_visual.cpp:66
+msgid "Bubbles with names"
+msgstr "有名气泡"
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "法力："
+#: src/gui/setup_visual.cpp:67
+msgid "Overhead text"
+msgstr "头顶文字"
 
-#: src/gui/textcommandeditor.cpp:209
-msgid "Target Type:"
-msgstr "目标类型："
+#: src/gui/setup_visual.cpp:71 src/gui/setup_visual.cpp:96
+msgid "off"
+msgstr "关闭"
 
-#: src/gui/textcommandeditor.cpp:215
-msgid "Icon:"
-msgstr "图示："
+#: src/gui/setup_visual.cpp:72 src/gui/setup_visual.cpp:81
+msgid "low"
+msgstr "低"
 
-#: src/gui/textcommandeditor.cpp:221
-msgid "Magic level:"
-msgstr "魔法等级："
+#: src/gui/setup_visual.cpp:73 src/gui/setup_visual.cpp:83
+msgid "high"
+msgstr "高"
 
-#: src/gui/textcommandeditor.cpp:227
-msgid "Magic School:"
-msgstr "魔法学院："
+#: src/gui/setup_visual.cpp:74
+msgid "Ambient FX"
+msgstr "环境音效"
 
-#: src/gui/textcommandeditor.cpp:233
-msgid "School level:"
-msgstr "学校层次："
+#: src/gui/setup_visual.cpp:77
+msgid "Particle effects"
+msgstr "粒子效果"
 
-#: src/gui/textcommandeditor.cpp:238
-msgid "Save"
-msgstr "保存"
+#: src/gui/setup_visual.cpp:82
+msgid "medium"
+msgstr "中"
 
-#: src/gui/tradewindow.cpp:60
-msgid "Propose trade"
-msgstr "打算交易"
+#: src/gui/setup_visual.cpp:84
+msgid "max"
+msgstr "最大"
 
-#: src/gui/tradewindow.cpp:61
-msgid "Confirmed. Waiting..."
-msgstr "已确认。等待中……"
+#: src/gui/setup_visual.cpp:85
+msgid "Particle detail"
+msgstr "l"
 
-#: src/gui/tradewindow.cpp:62
-msgid "Agree trade"
-msgstr "同意交易"
+#: src/gui/setup_visual.cpp:91
+msgid "Gamma"
+msgstr ""
 
-#: src/gui/tradewindow.cpp:63
-msgid "Agreed. Waiting..."
-msgstr "已同意。等待中……"
+#: src/gui/setup_visual.cpp:97
+msgid "on"
+msgstr ""
 
-#: src/gui/tradewindow.cpp:66
-msgid "Trade: You"
-msgstr "交易：你"
+#: src/gui/setup_visual.cpp:98
+msgid "Vsync"
+msgstr ""
 
-#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
-#, c-format
-msgid "You get %s"
-msgstr "你得到%s"
+#: src/gui/shopwindow.cpp:76
+msgid "Personal Shop"
+msgstr "个人商店"
 
-#: src/gui/tradewindow.cpp:112
-msgid "You give:"
-msgstr "你给予："
+#: src/gui/shopwindow.cpp:119
+msgid "Buy items"
+msgstr "购买物品"
 
-#: src/gui/tradewindow.cpp:116
-msgid "Change"
-msgstr "改变"
+#: src/gui/shopwindow.cpp:120
+msgid "Sell items"
+msgstr "出售物品"
 
-#: src/gui/tradewindow.cpp:375
-msgid "You don't have enough money."
-msgstr "你没有足够的钱币."
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+msgid "Announce"
+msgstr "公布"
 
-#: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
+#: src/gui/shopwindow.cpp:128
+msgid "Show links in announce"
+msgstr "显示在公布的联系"
 
-#: src/gui/unregisterdialog.cpp:54
-#, c-format
-msgid "Name: %s"
-msgstr "姓名：%s"
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr "拍卖"
 
-#: src/gui/updaterwindow.cpp:140
-msgid "Updating..."
-msgstr "更新..."
+#: src/gui/shopwindow.cpp:760 src/net/ea/tradehandler.cpp:104
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr "请求交易"
 
-#: src/gui/updaterwindow.cpp:167
-msgid "Connecting..."
-msgstr "连接中..."
+#: src/gui/shopwindow.cpp:761
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr "%s想要%s %s 你接受吗？"
 
-#: src/gui/updaterwindow.cpp:170
-msgid "Play"
-msgstr "开始"
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:84
+msgid "Skills"
+msgstr "技能"
 
-#: src/gui/updaterwindow.cpp:597
-msgid "##1  The update process is incomplete."
-msgstr "##1 更新过程不完整。"
+#: src/gui/skilldialog.cpp:244
+msgid "Up"
+msgstr "升级"
 
-#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:599
-msgid "##1  It is strongly recommended that"
-msgstr "##1 强烈建议"
+#: src/gui/skilldialog.cpp:337
+#, c-format
+msgid "Skill points available: %d"
+msgstr "技能点：%d个"
 
-#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:601
-msgid "##1  you try again later."
+#: src/gui/skilldialog.cpp:381
+msgid "basic"
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:777
-msgid "Completed"
-msgstr "已完成"
-
-#: src/gui/userpalette.cpp:116
-msgid "Being"
-msgstr "存在"
-
-#: src/gui/userpalette.cpp:117
-msgid "Friend Names"
+#: src/gui/skilldialog.cpp:382
+msgid "Skill: basic, Id: 1"
 msgstr ""
 
-#: src/gui/userpalette.cpp:118
-msgid "Disregarded Names"
-msgstr "豁免计算名称"
+#: src/gui/skilldialog.cpp:419
+#, c-format
+msgid "Skill Set %d"
+msgstr ""
 
-#: src/gui/userpalette.cpp:119
-msgid "Ignored Names"
-msgstr "忽略名称"
+#: src/gui/skilldialog.cpp:431
+#, c-format
+msgid "Skill %d"
+msgstr "技能为%d"
 
-#: src/gui/userpalette.cpp:120
-msgid "Erased Names"
+#: src/gui/skilldialog.cpp:437
+#, c-format
+msgid "Skill: %s, Id: %d"
 msgstr ""
 
-#: src/gui/userpalette.cpp:121
-msgid "Other Players' Names"
-msgstr "其他玩家名"
+#: src/gui/skilldialog.cpp:507 src/gui/skilldialog.cpp:595
+#, c-format
+msgid "Lvl: %d"
+msgstr "等级: %d"
 
-#: src/gui/userpalette.cpp:122
-msgid "Own Name"
-msgstr "自己的名字"
+#: src/gui/skilldialog.cpp:587
+#, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "等级: %d（%+d）"
 
-#: src/gui/userpalette.cpp:123
-msgid "GM Names"
-msgstr "GM名"
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
+msgid "Guild"
+msgstr "帮会"
 
-#: src/gui/userpalette.cpp:124
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/socialwindow.cpp:175
+#, c-format
+msgid "Invited user %s to guild %s."
+msgstr "邀请用户%s加入公会%s"
 
-#: src/gui/userpalette.cpp:126
-msgid "Monster HP bar"
-msgstr "怪物的HPl"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Guild %s quit requested."
+msgstr "退出公会%s的请求。"
 
-#: src/gui/userpalette.cpp:128
-msgid "Monster HP bar (second color)"
-msgstr "怪物的HP指示栏(第二个颜色)"
+#: src/gui/socialwindow.cpp:216
+msgid "Member Invite to Guild"
+msgstr "会员邀请到公会"
 
-#: src/gui/userpalette.cpp:129
-msgid "Party Members"
-msgstr "党的议员"
+#: src/gui/socialwindow.cpp:217
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr "你要邀请谁加入工会%s?"
 
-#: src/gui/userpalette.cpp:130
-msgid "Guild Members"
-msgstr "公会成员"
+#: src/gui/socialwindow.cpp:226
+msgid "Leave Guild?"
+msgstr "离开公会？"
 
-#: src/gui/userpalette.cpp:131
-msgid "Particle Effects"
-msgstr "粒子效果"
+#: src/gui/socialwindow.cpp:227
+#, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "你确定要离开工会%s吗？"
 
-#: src/gui/userpalette.cpp:132
-msgid "Pickup Notification"
-msgstr "拾起通知"
+#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+msgid "Party"
+msgstr "t"
 
-#: src/gui/userpalette.cpp:133
-msgid "Exp Notification"
-msgstr "到期通知"
+#: src/gui/socialwindow.cpp:375
+#, c-format
+msgid "Invited user %s to party."
+msgstr "邀请用户%s加入团队."
 
-#: src/gui/userpalette.cpp:134
-msgid "Player HP bar"
-msgstr "玩家惠普酒吧"
+#: src/gui/socialwindow.cpp:389
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
 
-#: src/gui/userpalette.cpp:136
-msgid "Player HP bar (second color)"
-msgstr "玩家HP指示栏(第二个颜色)"
+#: src/gui/socialwindow.cpp:416
+msgid "Member Invite to Party"
+msgstr ""
 
-#: src/gui/userpalette.cpp:137
-msgid "Player Hits Monster"
-msgstr "玩家怪物"
+#: src/gui/socialwindow.cpp:417
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
 
-#: src/gui/userpalette.cpp:138
-msgid "Monster Hits Player"
-msgstr "怪物点击播放器"
+#: src/gui/socialwindow.cpp:426
+msgid "Leave Party?"
+msgstr "离开团队?"
 
-#: src/gui/userpalette.cpp:140
-msgid "Other Player Hits Local Player"
-msgstr "其他玩家点击本土球员"
+#: src/gui/socialwindow.cpp:427
+#, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr ""
 
-#: src/gui/userpalette.cpp:141
-msgid "Critical Hit"
-msgstr "会心一击"
+#: src/gui/socialwindow.cpp:651
+msgid "Nav"
+msgstr ""
 
-#: src/gui/userpalette.cpp:143
-msgid "Local Player Hits Monster"
+#: src/gui/socialwindow.cpp:929
+msgid "Atk"
 msgstr ""
 
-#: src/gui/userpalette.cpp:145
-msgid "Local Player Critical Hit"
-msgstr "当前玩家"
+#: src/gui/socialwindow.cpp:970
+msgid "Priority mobs"
+msgstr ""
 
-#: src/gui/userpalette.cpp:147
-msgid "Local Player Miss"
+#: src/gui/socialwindow.cpp:1002
+msgid "Attack mobs"
+msgstr "攻击暴徒"
+
+#: src/gui/socialwindow.cpp:1037
+msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/userpalette.cpp:148
-msgid "Misses"
-msgstr "失误"
+#: src/gui/socialwindow.cpp:1197
+msgid "Create Guild"
+msgstr "创建帮会"
 
-#: src/gui/userpalette.cpp:149
-msgid "Portal Highlight"
-msgstr "门户高亮"
+#: src/gui/socialwindow.cpp:1198 src/gui/socialwindow.cpp:1633
+msgid "Create Party"
+msgstr "建立"
 
-#: src/gui/userpalette.cpp:151
-msgid "Default collision Highlight"
+#: src/gui/socialwindow.cpp:1240 src/gui/windowmenu.cpp:96
+msgid "Social"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
-msgid "Air collision Highlight"
+#: src/gui/socialwindow.cpp:1263
+msgid "Invite"
+msgstr "邀请"
+
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1279
+msgid "P"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
-msgid "Water collision Highlight"
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1283
+msgid "F"
 msgstr ""
 
-#: src/gui/userpalette.cpp:157
-msgid "Walkable Highlight"
-msgstr "步行高亮"
+#: src/gui/socialwindow.cpp:1416
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr "接受%s团队的邀请."
 
-#: src/gui/userpalette.cpp:159
-msgid "Local Player Attack Range"
-msgstr ""
+#: src/gui/socialwindow.cpp:1426
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr "拒绝%s的团队邀请."
 
-#: src/gui/userpalette.cpp:161
-msgid "Local Player Attack Range Border"
+#: src/gui/socialwindow.cpp:1443
+#, c-format
+msgid "Accepted guild invite from %s."
+msgstr "已接受公会邀请来自%s."
+
+#: src/gui/socialwindow.cpp:1456
+#, c-format
+msgid "Rejected guild invite from %s."
+msgstr "拒绝%s的公会邀请."
+
+#: src/gui/socialwindow.cpp:1503
+#, c-format
+msgid "Creating guild called %s."
+msgstr "创建公会的名为%s"
+
+#: src/gui/socialwindow.cpp:1526
+#, c-format
+msgid "Creating party called %s."
+msgstr "创建团队名字为%s的"
+
+#: src/gui/socialwindow.cpp:1540
+msgid "Guild Name"
+msgstr "公会名称"
+
+#: src/gui/socialwindow.cpp:1541
+msgid "Choose your guild's name."
+msgstr "选择你的公会的名字."
+
+#: src/gui/socialwindow.cpp:1555
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/userpalette.cpp:163
-msgid "Monster Attack Range"
-msgstr "怪物攻击范围"
+#: src/gui/socialwindow.cpp:1561
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s邀请你加入公会%s"
 
-#: src/gui/userpalette.cpp:165
-msgid "Home Place"
-msgstr "家居广场"
+#: src/gui/socialwindow.cpp:1567
+msgid "Accept Guild Invite"
+msgstr "接受邀请"
 
-#: src/gui/userpalette.cpp:167
-msgid "Home Place Border"
-msgstr "家居广场边界"
+#: src/gui/socialwindow.cpp:1582
+msgid "Received party request, but one already exists."
+msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/userpalette.cpp:169
-msgid "Road Point"
-msgstr "路点"
+#: src/gui/socialwindow.cpp:1593
+msgid "You have been invited you to join a party."
+msgstr "您已被邀请您加入党。"
 
-#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:616
-msgid "Who Is Online - Updating"
-msgstr "谁在线 - 更新"
+#: src/gui/socialwindow.cpp:1597
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/whoisonline.cpp:103
-msgid "Update"
-msgstr "更新"
+#: src/gui/socialwindow.cpp:1605
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/whoisonline.cpp:196
-msgid "Who Is Online - "
-msgstr "谁在线 -"
+#: src/gui/socialwindow.cpp:1610
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/whoisonline.cpp:630
-msgid "Who Is Online - error"
-msgstr "谁在线 - 错误"
+#: src/gui/socialwindow.cpp:1619
+msgid "Accept Party Invite"
+msgstr "接受帮会邀请"
 
-#: src/gui/whoisonline.cpp:670
-msgid "Who Is Online - Update"
-msgstr "谁在线 - 更新"
+#: src/gui/socialwindow.cpp:1634
+msgid "Cannot create party. You are already in a party"
+msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/widgets/battletab.cpp:45
-msgid "Battle"
-msgstr "战斗"
+#: src/gui/socialwindow.cpp:1639
+msgid "Party Name"
+msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
-msgid "/users > Lists the users in the current channel"
-msgstr "/usr > 列出当前频道的用户"
+#: src/gui/socialwindow.cpp:1640
+msgid "Choose your party's name."
+msgstr "选择n的名称。"
 
-#: src/gui/widgets/channeltab.cpp:53
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > 设置当前聊天频道的主题"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:91
+msgid "Specials"
+msgstr "特价商品"
 
-#: src/gui/widgets/channeltab.cpp:54
-msgid "/quit > Leave a channel"
-msgstr "/quit > 离开频道"
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
+#, c-format
+msgid "Level: %d"
+msgstr "等级：%d"
 
-#: src/gui/widgets/channeltab.cpp:55
-msgid "/op > Make a user a channel operator"
-msgstr "/op > 使用户称为频道管理员"
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Money: %s"
+msgstr "金币: %s"
 
-#: src/gui/widgets/channeltab.cpp:56
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > 把用户踢出频道"
+#: src/gui/statuswindow.cpp:157
+msgid "HP:"
+msgstr "HP："
 
-#: src/gui/widgets/channeltab.cpp:66
-msgid "Command: /users"
-msgstr "命令：/users"
+#: src/gui/statuswindow.cpp:164
+msgid "Exp:"
+msgstr "经验："
 
-#: src/gui/widgets/channeltab.cpp:67
-msgid "This command shows the users in this channel."
-msgstr "该命令显示当前频道的用户"
+#: src/gui/statuswindow.cpp:178
+msgid "MP:"
+msgstr "MP："
 
-#: src/gui/widgets/channeltab.cpp:71
-msgid "Command: /topic <message>"
-msgstr "命令：/topic <讯息>"
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
+#, c-format
+msgid "Job: %d"
+msgstr "职业：%d"
 
-#: src/gui/widgets/channeltab.cpp:72
-msgid "This command sets the topic to <message>."
-msgstr "该命令设置主题为<讯息>"
+#: src/gui/statuswindow.cpp:211
+msgid "Job:"
+msgstr "职业："
 
-#: src/gui/widgets/channeltab.cpp:76
-msgid "Command: /quit"
-msgstr "命令：/quit"
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
+#, c-format
+msgid "Character points: %d"
+msgstr "角色可用点: %d"
 
-#: src/gui/widgets/channeltab.cpp:77
-msgid "This command leaves the current channel."
-msgstr "该命令离开当前频道"
+#: src/gui/statuswindow.cpp:275
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr "级别:%d (GM %d)"
 
-#: src/gui/widgets/channeltab.cpp:78
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "如果你是该频道的最后成员，离开后该频道将被删除。"
+#: src/gui/statuswindow.cpp:331
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
-msgid "Command: /op <nick>"
-msgstr "命令：/op <昵称>"
+#: src/gui/textcommandeditor.cpp:111
+msgid "No Target"
+msgstr "没有目标"
 
-#: src/gui/widgets/channeltab.cpp:84
-msgid "This command makes <nick> a channel operator."
-msgstr "该命令使<昵称>成为频道管理员。"
+#: src/gui/textcommandeditor.cpp:112
+msgid "Allow Target"
+msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
-#: src/net/ea/gui/partytab.cpp:86
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
+#: src/gui/textcommandeditor.cpp:113
+msgid "Need Target"
+msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:87
-msgid "Channel operators can kick and op other users from the channel."
-msgstr "频道管理员可以踢出或者op频道内的其他用户"
+#: src/gui/textcommandeditor.cpp:118
+msgid "General Magic"
+msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:92
-msgid "Command: /kick <nick>"
-msgstr "命令：/kick <昵称>"
+#: src/gui/textcommandeditor.cpp:119
+msgid "Life Magic"
+msgstr "生活魔术"
 
-#: src/gui/widgets/channeltab.cpp:93
-msgid "This command makes <nick> leave the channel."
-msgstr "该命令致使<昵称>离开频道。"
+#: src/gui/textcommandeditor.cpp:120
+msgid "War Magic"
+msgstr "战魔"
 
-#: src/gui/widgets/channeltab.cpp:118
-msgid "Need a user to op!"
-msgstr "需要一个用户来操作"
+#: src/gui/textcommandeditor.cpp:121
+msgid "Transmute Magic"
+msgstr "蜕变魔术"
 
-#: src/gui/widgets/channeltab.cpp:125
-msgid "Need a user to kick!"
-msgstr "踢人时需要指定用户！"
+#: src/gui/textcommandeditor.cpp:122
+msgid "Nature Magic"
+msgstr "大自然的神奇"
 
-#: src/gui/widgets/chattab.cpp:151
-msgid "Global announcement:"
-msgstr "全局公告："
+#: src/gui/textcommandeditor.cpp:123
+msgid "Astral Magic"
+msgstr "星芒魔术"
 
-#: src/gui/widgets/chattab.cpp:157
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "%s 全局公告："
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr "命令编辑器"
 
-#: src/gui/widgets/chattab.cpp:184
-#, c-format
-msgid "%s whispers: %s"
-msgstr "%s私语:%s"
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr "魔术"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /invite <nick>"
-msgstr "命令：/invite <昵称>"
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr "其他"
 
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr "符号："
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
-#: src/net/ea/gui/partytab.cpp:91
-msgid "Command: /leave"
-msgstr "命令：/leave"
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr "命令："
 
-#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
-msgid "This command causes the player to leave the guild."
+#: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
-#: src/net/ea/gui/partytab.cpp:70
-msgid "/help > Display this help."
-msgstr "/help > 显示该帮助信息。"
+#: src/gui/textcommandeditor.cpp:203
+msgid "Mana:"
+msgstr "法力："
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > "
+#: src/gui/textcommandeditor.cpp:209
+msgid "Target Type:"
+msgstr "目标类型："
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > "
+#: src/gui/textcommandeditor.cpp:215
+msgid "Icon:"
+msgstr "图示："
 
-#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick >"
+#: src/gui/textcommandeditor.cpp:221
+msgid "Magic level:"
+msgstr "魔法等级："
 
-#: src/gui/widgets/whispertab.cpp:107
-msgid "/ignore > Ignore the other player"
-msgstr "/ignore > "
+#: src/gui/textcommandeditor.cpp:227
+msgid "Magic School:"
+msgstr "魔法学院："
 
-#: src/gui/widgets/whispertab.cpp:108
-msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > 停止忽视了其他"
+#: src/gui/textcommandeditor.cpp:233
+msgid "School level:"
+msgstr "学校层次："
 
-#: src/gui/widgets/whispertab.cpp:109
-msgid "/close > Close the whisper tab"
-msgstr "/close > 关闭密语标签页"
+#: src/gui/textcommandeditor.cpp:238
+msgid "Save"
+msgstr "保存"
 
-#: src/gui/widgets/whispertab.cpp:119
-msgid "Command: /close"
-msgstr "命令: /close"
+#: src/gui/tradewindow.cpp:60
+msgid "Propose trade"
+msgstr "打算交易"
 
-#: src/gui/widgets/whispertab.cpp:120
-msgid "This command closes the current whisper tab."
-msgstr "该命令关闭当前密语标签页。"
+#: src/gui/tradewindow.cpp:61
+msgid "Confirmed. Waiting..."
+msgstr "已确认。等待中……"
 
-#: src/gui/widgets/whispertab.cpp:124
-msgid "Command: /ignore"
-msgstr "命令：/ignore"
+#: src/gui/tradewindow.cpp:62
+msgid "Agree trade"
+msgstr "同意交易"
 
-#: src/gui/widgets/whispertab.cpp:125
-msgid "This command ignores the other player regardless of current relations."
-msgstr "此命令忽略了其他，不管目前的关系。"
+#: src/gui/tradewindow.cpp:63
+msgid "Agreed. Waiting..."
+msgstr "已同意。等待中……"
 
-#: src/gui/widgets/whispertab.cpp:130
-msgid "Command: /unignore <player>"
-msgstr "命令: /unignore <玩家>"
+#: src/gui/tradewindow.cpp:66
+msgid "Trade: You"
+msgstr "交易：你"
 
-#: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
+#: src/gui/tradewindow.cpp:112 src/gui/tradewindow.cpp:168
+#, c-format
+msgid "You get %s"
+msgstr "你得到%s"
 
-#: src/gui/windowmenu.cpp:67
-msgid "BC"
-msgstr ""
+#: src/gui/tradewindow.cpp:113
+msgid "You give:"
+msgstr "你给予："
 
-#: src/gui/windowmenu.cpp:67
-msgid "Bot checker"
-msgstr "挂机检查"
+#: src/gui/tradewindow.cpp:117
+msgid "Change"
+msgstr "改变"
 
-#: src/gui/windowmenu.cpp:69
-msgid "ONL"
-msgstr ""
+#: src/gui/tradewindow.cpp:376
+msgid "You don't have enough money."
+msgstr "你没有足够的钱币."
 
-#: src/gui/windowmenu.cpp:69
-msgid "Who is online"
-msgstr "谁在线"
+#: src/gui/tradewindow.cpp:455
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
-#: src/gui/windowmenu.cpp:71
-msgid "KS"
-msgstr ""
+#: src/gui/unregisterdialog.cpp:54
+#, c-format
+msgid "Name: %s"
+msgstr "姓名：%s"
 
-#: src/gui/windowmenu.cpp:73
-msgid "Smilies"
-msgstr "表情符号"
+#: src/gui/updaterwindow.cpp:140
+msgid "Updating..."
+msgstr "更新..."
 
-#: src/gui/windowmenu.cpp:75
-msgid "STA"
-msgstr ""
+#: src/gui/updaterwindow.cpp:167
+msgid "Connecting..."
+msgstr "连接中..."
 
-#: src/gui/windowmenu.cpp:75
-msgid "Status"
-msgstr "状态"
+#: src/gui/updaterwindow.cpp:170
+msgid "Play"
+msgstr "开始"
 
-#: src/gui/windowmenu.cpp:76
-msgid "EQU"
-msgstr ""
+#: src/gui/updaterwindow.cpp:597
+msgid "##1  The update process is incomplete."
+msgstr "##1 更新过程不完整。"
 
-#: src/gui/windowmenu.cpp:78
-msgid "INV"
-msgstr ""
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updaterwindow.cpp:599
+msgid "##1  It is strongly recommended that"
+msgstr "##1 强烈建议"
 
-#: src/gui/windowmenu.cpp:83
-msgid "SKI"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updaterwindow.cpp:601
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:90
-msgid "SPE"
-msgstr ""
+#: src/gui/updaterwindow.cpp:777
+msgid "Completed"
+msgstr "已完成"
 
-#: src/gui/windowmenu.cpp:95
-msgid "SOC"
-msgstr ""
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr "存在"
 
-#: src/gui/windowmenu.cpp:96
-msgid "SH"
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
-msgid "Shortcuts"
-msgstr ""
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr "豁免计算名称"
 
-#: src/gui/windowmenu.cpp:98
-msgid "SP"
-msgstr ""
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr "忽略名称"
 
-#: src/gui/windowmenu.cpp:99
-msgid "DR"
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:100
-msgid "YK"
-msgstr "YK"
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr "其他玩家名"
 
-#: src/gui/windowmenu.cpp:100
-msgid "Did you know"
-msgstr "你知道吗"
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr "自己的名字"
 
-#: src/gui/windowmenu.cpp:102
-msgid "SET"
-msgstr "SET"
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr "GM名"
 
-#: src/gui/worldselectdialog.cpp:78
-msgid "Select World"
-msgstr "选择世界"
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr "NPCs"
 
-#: src/gui/worldselectdialog.cpp:83
-msgid "Change Login"
-msgstr ""
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr "怪物的HPl"
 
-#: src/gui/worldselectdialog.cpp:84
-msgid "Choose World"
-msgstr ""
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr "怪物的HP指示栏(第二个颜色)"
 
-#: src/inventory.cpp:252
-msgid "Storage"
-msgstr "仓库"
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr "党的议员"
 
-#: src/inventory.cpp:254
-msgid "Cart"
-msgstr ""
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr "公会成员"
 
-#: src/keyboardconfig.cpp:72 src/keyboarddata.h:497 src/keyboarddata.h:503
-#: src/keyboarddata.h:509 src/keyboarddata.h:515 src/keyboarddata.h:521
-#: src/keyboarddata.h:527 src/keyboarddata.h:533 src/keyboarddata.h:539
-#: src/keyboarddata.h:545 src/keyboarddata.h:551 src/keyboarddata.h:557
-#: src/keyboarddata.h:563 src/keyboarddata.h:569 src/keyboarddata.h:575
-#: src/keyboarddata.h:581 src/keyboarddata.h:587 src/keyboarddata.h:593
-#: src/keyboarddata.h:599 src/keyboarddata.h:605 src/keyboarddata.h:611
-#: src/keyboarddata.h:617 src/keyboarddata.h:623 src/keyboarddata.h:629
-#: src/keyboarddata.h:635 src/keyboarddata.h:641 src/keyboarddata.h:647
-#: src/keyboarddata.h:653 src/keyboarddata.h:659 src/keyboarddata.h:665
-#: src/keyboarddata.h:671 src/keyboarddata.h:677 src/keyboarddata.h:683
-#: src/keyboarddata.h:689 src/keyboarddata.h:695 src/keyboarddata.h:701
-#: src/keyboarddata.h:707 src/keyboarddata.h:713 src/keyboarddata.h:719
-#: src/keyboarddata.h:725 src/keyboarddata.h:731 src/keyboarddata.h:737
-#: src/keyboarddata.h:743 src/keyboarddata.h:749 src/keyboarddata.h:755
-#: src/keyboarddata.h:761 src/keyboarddata.h:767 src/keyboarddata.h:773
-#: src/keyboarddata.h:779
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "表情快捷键为 %d"
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr "粒子效果"
 
-#: src/keyboardconfig.cpp:77 src/keyboarddata.h:227 src/keyboarddata.h:233
-#: src/keyboarddata.h:239 src/keyboarddata.h:245 src/keyboarddata.h:251
-#: src/keyboarddata.h:257 src/keyboarddata.h:263 src/keyboarddata.h:269
-#: src/keyboarddata.h:275 src/keyboarddata.h:281 src/keyboarddata.h:287
-#: src/keyboarddata.h:293 src/keyboarddata.h:299 src/keyboarddata.h:305
-#: src/keyboarddata.h:311 src/keyboarddata.h:317 src/keyboarddata.h:323
-#: src/keyboarddata.h:329 src/keyboarddata.h:335 src/keyboarddata.h:341
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "物品快捷 %d"
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr "拾起通知"
 
-#: src/keyboardconfig.cpp:138
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr "到期通知"
 
-#: src/keyboardconfig.cpp:201
-#, c-format
-msgid "key_%d"
-msgstr ""
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr "玩家惠普酒吧"
 
-#: src/keyboardconfig.cpp:203
-msgid "unknown key"
-msgstr ""
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr "玩家HP指示栏(第二个颜色)"
 
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
-msgid "u key"
-msgstr ""
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr "玩家怪物"
 
-#: src/keyboarddata.h:52
-msgid "Basic Keys"
-msgstr "基本按键"
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr "怪物点击播放器"
 
-#: src/keyboarddata.h:58
-msgid "Move Up"
-msgstr "向上移动"
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr "其他玩家点击本土球员"
 
-#: src/keyboarddata.h:64
-msgid "Move Down"
-msgstr "向下移动"
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr "会心一击"
 
-#: src/keyboarddata.h:70
-msgid "Move Left"
-msgstr "向左移动"
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
 
-#: src/keyboarddata.h:76
-msgid "Move Right"
-msgstr "向右移动"
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr "当前玩家"
 
-#: src/keyboarddata.h:88
-msgid "Target & Attack"
-msgstr "对准并攻击"
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
 
-#: src/keyboarddata.h:94
-msgid "Move to Target"
-msgstr "移动到目标"
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr "失误"
 
-#: src/keyboarddata.h:100
-msgid "Change Move to Target type"
-msgstr "更改移动到目标类型"
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr "门户高亮"
 
-#: src/keyboarddata.h:106
-msgid "Move to Home location"
-msgstr "移动到首页位置"
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
 
-#: src/keyboarddata.h:112
-msgid "Set home location"
-msgstr "设为首页位置"
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
 
-#: src/keyboarddata.h:118
-msgid "Move to navigation point"
-msgstr "移动导航点"
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
 
-#: src/keyboarddata.h:130
-msgid "Stop Attack"
-msgstr "停止攻击"
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr "步行高亮"
 
-#: src/keyboarddata.h:136
-msgid "Untarget"
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/keyboarddata.h:142
-msgid "Target Closest"
-msgstr "目标最接近"
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
 
-#: src/keyboarddata.h:148
-msgid "Target NPC"
-msgstr "目标NPC"
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr "怪物攻击范围"
 
-#: src/keyboarddata.h:154
-msgid "Target Player"
-msgstr "目标玩家"
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr "家居广场"
 
-#: src/keyboarddata.h:160
-msgid "Pickup"
-msgstr "捡起"
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr "家居广场边界"
 
-#: src/keyboarddata.h:166
-msgid "Change Pickup Type"
-msgstr "更改皮卡型"
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr "路点"
 
-#: src/keyboarddata.h:172
-msgid "Hide Windows"
-msgstr "隐藏窗口"
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618
+msgid "Who Is Online - Updating"
+msgstr "谁在线 - 更新"
 
-#: src/keyboarddata.h:178
-msgid "Sit"
-msgstr "坐下"
+#: src/gui/whoisonline.cpp:104
+msgid "Update"
+msgstr "更新"
 
-#: src/keyboarddata.h:184
-msgid "Screenshot"
-msgstr "屏幕快照"
+#: src/gui/whoisonline.cpp:197
+msgid "Who Is Online - "
+msgstr "谁在线 -"
 
-#: src/keyboarddata.h:190
-msgid "Enable/Disable Trading"
-msgstr "开启/关闭交易"
+#: src/gui/whoisonline.cpp:632
+msgid "Who Is Online - error"
+msgstr "谁在线 - 错误"
 
-#: src/keyboarddata.h:196
-msgid "Change Map View Mode"
-msgstr "更改地图浏览模式"
+#: src/gui/whoisonline.cpp:672
+msgid "Who Is Online - Update"
+msgstr "谁在线 - 更新"
 
-#: src/keyboarddata.h:202
-msgid "Select OK"
-msgstr "选择OK"
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr "战斗"
 
-#: src/keyboarddata.h:215
-msgid "Shortcuts Keys"
-msgstr "快捷按键"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/users > Lists the users in the current channel"
+msgstr "/usr > 列出当前频道的用户"
 
-#: src/keyboarddata.h:221
-msgid "Item Shortcuts Key"
-msgstr "项目的快捷键"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > 设置当前聊天频道的主题"
 
-#: src/keyboarddata.h:347
-msgid "Windows Keys"
-msgstr "窗口按键"
+#: src/gui/widgets/channeltab.cpp:54
+msgid "/quit > Leave a channel"
+msgstr "/quit > 离开频道"
 
-#: src/keyboarddata.h:353
-msgid "Help Window"
-msgstr "帮助窗口"
+#: src/gui/widgets/channeltab.cpp:55
+msgid "/op > Make a user a channel operator"
+msgstr "/op > 使用户称为频道管理员"
 
-#: src/keyboarddata.h:359
-msgid "Status Window"
-msgstr "状态窗口"
+#: src/gui/widgets/channeltab.cpp:56
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > 把用户踢出频道"
 
-#: src/keyboarddata.h:365
-msgid "Inventory Window"
-msgstr "物品栏窗口"
+#: src/gui/widgets/channeltab.cpp:66
+msgid "Command: /users"
+msgstr "命令：/users"
 
-#: src/keyboarddata.h:371
-msgid "Equipment Window"
-msgstr "装备窗口"
+#: src/gui/widgets/channeltab.cpp:67
+msgid "This command shows the users in this channel."
+msgstr "该命令显示当前频道的用户"
 
-#: src/keyboarddata.h:377
-msgid "Skill Window"
-msgstr "技能窗口"
+#: src/gui/widgets/channeltab.cpp:71
+msgid "Command: /topic <message>"
+msgstr "命令：/topic <讯息>"
 
-#: src/keyboarddata.h:383
-msgid "Minimap Window"
-msgstr "小地图窗口"
+#: src/gui/widgets/channeltab.cpp:72
+msgid "This command sets the topic to <message>."
+msgstr "该命令设置主题为<讯息>"
 
-#: src/keyboarddata.h:389
-msgid "Chat Window"
-msgstr "聊天窗口"
+#: src/gui/widgets/channeltab.cpp:76
+msgid "Command: /quit"
+msgstr "命令：/quit"
 
-#: src/keyboarddata.h:395
-msgid "Item Shortcut Window"
-msgstr "物品快捷窗口"
+#: src/gui/widgets/channeltab.cpp:77
+msgid "This command leaves the current channel."
+msgstr "该命令离开当前频道"
 
-#: src/keyboarddata.h:401
-msgid "Setup Window"
-msgstr "设置窗口"
+#: src/gui/widgets/channeltab.cpp:78
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "如果你是该频道的最后成员，离开后该频道将被删除。"
 
-#: src/keyboarddata.h:407
-msgid "Debug Window"
-msgstr "Debug窗口"
+#: src/gui/widgets/channeltab.cpp:83
+msgid "Command: /op <nick>"
+msgstr "命令：/op <昵称>"
 
-#: src/keyboarddata.h:413
-msgid "Social Window"
-msgstr "社会窗口"
+#: src/gui/widgets/channeltab.cpp:84
+msgid "This command makes <nick> a channel operator."
+msgstr "该命令使<昵称>成为频道管理员。"
 
-#: src/keyboarddata.h:419
-msgid "Emote Shortcut Window"
-msgstr "表情快捷窗口"
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
 
-#: src/keyboarddata.h:425
-msgid "Outfits Window"
-msgstr "套装窗口"
+#: src/gui/widgets/channeltab.cpp:87
+msgid "Channel operators can kick and op other users from the channel."
+msgstr "频道管理员可以踢出或者op频道内的其他用户"
 
-#: src/keyboarddata.h:431
-msgid "Shop Window"
-msgstr "橱窗"
+#: src/gui/widgets/channeltab.cpp:92
+msgid "Command: /kick <nick>"
+msgstr "命令：/kick <昵称>"
 
-#: src/keyboarddata.h:437
-msgid "Quick drop Window"
-msgstr "快速下拉窗口"
+#: src/gui/widgets/channeltab.cpp:93
+msgid "This command makes <nick> leave the channel."
+msgstr "该命令致使<昵称>离开频道。"
 
-#: src/keyboarddata.h:443
-msgid "Kill Stats Window"
-msgstr "杀敌统计窗口"
+#: src/gui/widgets/channeltab.cpp:118
+msgid "Need a user to op!"
+msgstr "需要一个用户来操作"
 
-#: src/keyboarddata.h:449
-msgid "Commands Window"
-msgstr "命令的窗口"
+#: src/gui/widgets/channeltab.cpp:125
+msgid "Need a user to kick!"
+msgstr "踢人时需要指定用户！"
 
-#: src/keyboarddata.h:455
-msgid "Bot Checker Window"
-msgstr "挂机检查窗口"
+#: src/gui/widgets/chattab.cpp:150
+msgid "Global announcement:"
+msgstr "全局公告："
 
-#: src/keyboarddata.h:461
-msgid "Who Is Online Window"
-msgstr "谁是在线窗口"
+#: src/gui/widgets/chattab.cpp:156
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "%s 全局公告："
 
-#: src/keyboarddata.h:467
-msgid "Did you know Window"
-msgstr "你知道吗窗口"
+#: src/gui/widgets/chattab.cpp:183
+#, c-format
+msgid "%s whispers: %s"
+msgstr "%s私语:%s"
 
-#: src/keyboarddata.h:473
-msgid "Previous Social Tab"
-msgstr "上一页社会标签"
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr "命令：/invite <昵称>"
 
-#: src/keyboarddata.h:479
-msgid "Next Social Tab"
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/keyboarddata.h:485
-msgid "Emotes Keys"
-msgstr "表情按键"
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr "命令：/leave"
 
-#: src/keyboarddata.h:491
-msgid "Smilie"
-msgstr "笑脸"
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/keyboarddata.h:785
-msgid "Outfits Keys"
-msgstr "套装按键"
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr "/help > 显示该帮助信息。"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > "
 
-#: src/keyboarddata.h:790
-msgid "Wear Outfit"
-msgstr "装备套装"
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > "
 
-#: src/keyboarddata.h:793
-msgid "Copy Outfit"
-msgstr ""
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick >"
 
-#: src/keyboarddata.h:797
-msgid "Copy equipped to Outfit"
-msgstr ""
+#: src/gui/widgets/whispertab.cpp:107
+msgid "/ignore > Ignore the other player"
+msgstr "/ignore > "
 
-#: src/keyboarddata.h:802
-msgid "Chat Keys"
-msgstr "聊天按键"
+#: src/gui/widgets/whispertab.cpp:108
+msgid "/unignore > Stop ignoring the other player"
+msgstr "/unignore > 停止忽视了其他"
 
-#: src/keyboarddata.h:805
-msgid "Toggle Chat"
-msgstr "切换聊天"
+#: src/gui/widgets/whispertab.cpp:109
+msgid "/close > Close the whisper tab"
+msgstr "/close > 关闭密语标签页"
 
-#: src/keyboarddata.h:811
-msgid "Scroll Chat Up"
-msgstr "向上滚动聊天记录"
+#: src/gui/widgets/whispertab.cpp:119
+msgid "Command: /close"
+msgstr "命令: /close"
 
-#: src/keyboarddata.h:817
-msgid "Scroll Chat Down"
-msgstr "向下滚动聊天记录"
+#: src/gui/widgets/whispertab.cpp:120
+msgid "This command closes the current whisper tab."
+msgstr "该命令关闭当前密语标签页。"
 
-#: src/keyboarddata.h:823
-msgid "Previous Chat Tab"
-msgstr "上一个聊天窗口标签页"
+#: src/gui/widgets/whispertab.cpp:124
+msgid "Command: /ignore"
+msgstr "命令：/ignore"
 
-#: src/keyboarddata.h:829
-msgid "Next Chat Tab"
-msgstr "下一个聊天窗口标签页"
+#: src/gui/widgets/whispertab.cpp:125
+msgid "This command ignores the other player regardless of current relations."
+msgstr "此命令忽略了其他，不管目前的关系。"
 
-#: src/keyboarddata.h:835
-msgid "Close current Chat Tab"
-msgstr "关闭当前聊天标签"
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr "命令: /unignore <玩家>"
 
-#: src/keyboarddata.h:840
-msgid "Previous chat line"
-msgstr ""
+#: src/gui/widgets/whispertab.cpp:131
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
 
-#: src/keyboarddata.h:843
-msgid "Next chat line"
+#: src/gui/windowmenu.cpp:68
+msgid "BC"
 msgstr ""
 
-#: src/keyboarddata.h:846
-msgid "Chat Auto Complete"
-msgstr "自动完成交谈"
-
-#: src/keyboarddata.h:849
-msgid "Deactivate Chat Input"
-msgstr "停用聊天输入"
+#: src/gui/windowmenu.cpp:68
+msgid "Bot checker"
+msgstr "挂机检查"
 
-#: src/keyboarddata.h:852
-msgid "Other Keys"
-msgstr "其他按键"
+#: src/gui/windowmenu.cpp:70
+msgid "ONL"
+msgstr ""
 
-#: src/keyboarddata.h:855
-msgid "Ignore input 1"
-msgstr "忽略输入1"
+#: src/gui/windowmenu.cpp:70
+msgid "Who is online"
+msgstr "谁在线"
 
-#: src/keyboarddata.h:861
-msgid "Ignore input 2"
-msgstr "忽略输入2"
+#: src/gui/windowmenu.cpp:72
+msgid "KS"
+msgstr ""
 
-#: src/keyboarddata.h:867
-msgid "Direct Up"
-msgstr "直接向上"
+#: src/gui/windowmenu.cpp:74
+msgid "Smilies"
+msgstr "表情符号"
 
-#: src/keyboarddata.h:873
-msgid "Direct Down"
-msgstr "直接下"
+#: src/gui/windowmenu.cpp:76
+msgid "STA"
+msgstr ""
 
-#: src/keyboarddata.h:879
-msgid "Direct Left"
-msgstr "直接离开"
+#: src/gui/windowmenu.cpp:76
+msgid "Status"
+msgstr "状态"
 
-#: src/keyboarddata.h:885
-msgid "Direct Right"
-msgstr "直接对"
+#: src/gui/windowmenu.cpp:77
+msgid "EQU"
+msgstr ""
 
-#: src/keyboarddata.h:891
-msgid "Crazy moves"
-msgstr "疯狂移动"
+#: src/gui/windowmenu.cpp:79
+msgid "INV"
+msgstr ""
 
-#: src/keyboarddata.h:897
-msgid "Change Crazy Move mode"
-msgstr "更改疯狂移动模式"
+#: src/gui/windowmenu.cpp:84
+msgid "SKI"
+msgstr ""
 
-#: src/keyboarddata.h:903
-msgid "Quick Drop N Items from 0 slot"
+#: src/gui/windowmenu.cpp:91
+msgid "SPE"
 msgstr ""
 
-#: src/keyboarddata.h:909
-msgid "Quick Drop N Items"
-msgstr "快速下降序号项目"
+#: src/gui/windowmenu.cpp:96
+msgid "SOC"
+msgstr ""
 
-#: src/keyboarddata.h:915
-msgid "Switch Quick Drop Counter"
+#: src/gui/windowmenu.cpp:97
+msgid "SH"
 msgstr ""
 
-#: src/keyboarddata.h:921
-msgid "Quick heal target or self"
-msgstr "快速愈合的目标或自我"
+#: src/gui/windowmenu.cpp:97
+msgid "Shortcuts"
+msgstr ""
 
-#: src/keyboarddata.h:927
-msgid "Use #itenplz spell"
+#: src/gui/windowmenu.cpp:99
+msgid "SP"
 msgstr ""
 
-#: src/keyboarddata.h:933
-msgid "Use magic attack"
-msgstr "使用魔法攻击"
+#: src/gui/windowmenu.cpp:100
+msgid "DR"
+msgstr ""
 
-#: src/keyboarddata.h:939
-msgid "Switch magic attack"
-msgstr "切换魔法攻击"
+#: src/gui/windowmenu.cpp:101
+msgid "YK"
+msgstr "YK"
 
-#: src/keyboarddata.h:945
-msgid "Switch pvp attack"
-msgstr ""
+#: src/gui/windowmenu.cpp:101
+msgid "Did you know"
+msgstr "你知道吗"
 
-#: src/keyboarddata.h:951
-msgid "Change move type"
-msgstr "更改移动类型"
+#: src/gui/windowmenu.cpp:103
+msgid "SET"
+msgstr "SET"
 
-#: src/keyboarddata.h:957
-msgid "Change Attack Weapon Type"
-msgstr "更改攻击型武器"
+#: src/gui/worldselectdialog.cpp:78
+msgid "Select World"
+msgstr "选择世界"
 
-#: src/keyboarddata.h:963
-msgid "Change Attack Type"
-msgstr "更改攻击类型"
+#: src/gui/worldselectdialog.cpp:83
+msgid "Change Login"
+msgstr ""
 
-#: src/keyboarddata.h:969
-msgid "Change Follow mode"
-msgstr "更改跟随模式"
+#: src/gui/worldselectdialog.cpp:84
+msgid "Choose World"
+msgstr ""
 
-#: src/keyboarddata.h:975
-msgid "Change Imitation mode"
-msgstr "更改仿模式"
+#: src/inputmanager.cpp:283 src/inputmanager.cpp:321 src/keyboardconfig.cpp:81
+#, c-format
+msgid "key_%d"
+msgstr ""
 
-#: src/keyboarddata.h:981
-msgid "Disable / Enable Game modifier keys"
+#. TRANSLATORS: this is long joystick button name
+#: src/inputmanager.cpp:288
+#, c-format
+msgid "JButton%d"
 msgstr ""
 
-#: src/keyboarddata.h:987
-msgid "On / Off audio"
-msgstr "开/关 音频"
+#: src/inputmanager.cpp:300
+msgid "unknown key"
+msgstr ""
 
-#: src/keyboarddata.h:993
-msgid "Enable / Disable away mode"
-msgstr "启用/禁用离开模式"
+#. TRANSLATORS: this is short joystick button name
+#: src/inputmanager.cpp:327
+#, c-format
+msgid "JB%d"
+msgstr ""
 
-#: src/keyboarddata.h:999
-msgid "Emulate right click from keyboard"
-msgstr "从键盘模拟右键单击"
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/inputmanager.cpp:339 src/keyboardconfig.cpp:93
+msgid "u key"
+msgstr ""
 
-#: src/keyboarddata.h:1005
-msgid "Toggle camera mode"
-msgstr "切换模式"
+#: src/inventory.cpp:252
+msgid "Storage"
+msgstr "仓库"
 
-#: src/keyboarddata.h:1011
-msgid "Modifier key"
-msgstr "修改按键"
+#: src/inventory.cpp:254
+msgid "Cart"
+msgstr ""
 
-#: src/localplayer.cpp:376
+#: src/localplayer.cpp:378
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1431
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1437
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1473
+#: src/localplayer.cpp:1475
 #, 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:1675 src/localplayer.cpp:1709 src/localplayer.cpp:1710
+#: src/localplayer.cpp:1677 src/localplayer.cpp:1711 src/localplayer.cpp:1712
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1715 src/localplayer.cpp:1722 src/localplayer.cpp:1729
+#: src/localplayer.cpp:1717 src/localplayer.cpp:1724 src/localplayer.cpp:1731
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1904
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1905
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1906
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1907
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1908
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1909
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1931
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1936
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1940
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1954
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1955
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1956
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1957
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1958
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1959
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1960
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1961
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1962
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1981
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1982
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1983
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1984
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1985
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2004 src/localplayer.cpp:2008 src/localplayer.cpp:2031
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2005 src/localplayer.cpp:2027
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2006
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2007
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2028
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2029
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2030
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2082
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2083
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2084
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2085
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2086
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2087
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2088
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2089
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2102
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2103
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2104
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2105
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2106
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2107
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2126
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2127
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2128
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2129
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2130
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2131
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2148
+#: src/localplayer.cpp:2150
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2151
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2152
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2153
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2154
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2171
+#: src/localplayer.cpp:2173
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2174
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2175
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2201
+#: src/localplayer.cpp:2203
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:2221
+#: src/localplayer.cpp:2223
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2224
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2223 src/localplayer.cpp:2238
+#: src/localplayer.cpp:2225 src/localplayer.cpp:2240
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2238
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2239
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2262
+#: src/localplayer.cpp:2264
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2265
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3778
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3780 src/localplayer.cpp:3795
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3787
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3789 src/localplayer.cpp:3797
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4146
+#: src/localplayer.cpp:4151
 msgid "You see "
 msgstr "你看"
 
@@ -5288,7 +5350,7 @@ msgstr "交易取消。"
 msgid "Trade completed."
 msgstr "交易完成。"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
 msgid "Strength"
 msgstr "力量"
 
@@ -5297,7 +5359,7 @@ msgstr "力量"
 msgid "Strength %+.1f"
 msgstr "力量%+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
 msgid "Agility"
 msgstr "敏捷"
 
@@ -5306,7 +5368,7 @@ msgstr "敏捷"
 msgid "Agility %+.1f"
 msgstr "敏捷 %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
 msgid "Dexterity"
 msgstr "敏捷"
 
@@ -5315,7 +5377,7 @@ msgstr "敏捷"
 msgid "Dexterity %+.1f"
 msgstr "灵巧%+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
 msgid "Vitality"
 msgstr "生命"
 
@@ -5324,7 +5386,7 @@ msgstr "生命"
 msgid "Vitality %+.1f"
 msgstr "活力%+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
 msgid "Intelligence"
 msgstr "智慧"
 
@@ -5652,54 +5714,54 @@ msgstr "重复登录。"
 msgid "Unknown connection error."
 msgstr "未知的连接错误。"
 
-#: src/net/tmwa/generalhandler.cpp:235
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "Luck"
 msgstr "幸运"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Defense"
 msgstr "防御"
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:277
+#: src/net/tmwa/generalhandler.cpp:276
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:278
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:280
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
-#: src/net/tmwa/generalhandler.cpp:282
+#: src/net/tmwa/generalhandler.cpp:281
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
-#: src/net/tmwa/generalhandler.cpp:284
+#: src/net/tmwa/generalhandler.cpp:283
 msgid "Walk Delay"
 msgstr "步行延迟"
 
-#: src/net/tmwa/generalhandler.cpp:286
+#: src/net/tmwa/generalhandler.cpp:285
 msgid "Attack Range"
 msgstr "攻击范围"
 
-#: src/net/tmwa/generalhandler.cpp:288
+#: src/net/tmwa/generalhandler.cpp:287
 msgid "Damage per sec."
 msgstr "每秒伤害"
 
-- 
cgit v1.2.3-60-g2f50