From 0b67538b1d403a14f4754aaa7fe3aabc098abe41 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 4 Feb 2014 23:03:38 +0300
Subject: update translations.

---
 po/zh_CN.po | 351 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 186 insertions(+), 165 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e0332a7f3..d63b0785a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-01 12:07+0300\n"
-"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"POT-Creation-Date: 2014-02-04 22:58+0300\n"
+"PO-Revision-Date: 2014-02-02 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -529,7 +529,8 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
+#: src/gui/windows/setupwindow.cpp:59
 msgid "Setup"
 msgstr "设置"
 
@@ -743,7 +744,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:152
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
@@ -932,14 +933,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
 #: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
 msgid "Debug"
 msgstr "调试 "
@@ -1075,7 +1076,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
 #: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
 #: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1936 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "移动"
 
@@ -1187,7 +1188,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
 #: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1821
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
@@ -1196,7 +1197,7 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
 #: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:92
+#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
@@ -1269,7 +1270,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1944
 #: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
@@ -1339,7 +1340,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
 msgid "Leave"
 msgstr "留下"
 
@@ -1421,7 +1422,7 @@ msgstr ""
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
 #: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
 msgid "Store"
 msgstr "存储"
 
@@ -1800,9 +1801,8 @@ msgstr "移动导航点"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
-#, fuzzy
 msgid "Stop Attack / Modifier key"
-msgstr "修改按键"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
@@ -2043,23 +2043,45 @@ msgid "Next Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:510
+#: src/gui/setupactiondata.h:501
+#, fuzzy
+msgid "Previous Shortcuts tab"
+msgstr "上一页社会标签"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:507
+#, fuzzy
+msgid "Next Shortcuts tab"
+msgstr "项目的快捷键"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:513
+#, fuzzy
+msgid "Previous Commands tab"
+msgstr "上一个聊天窗口标签页"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:519
+#, fuzzy
+msgid "Next Commands tab"
+msgstr "下一个聊天窗口标签页"
+
+#. TRANSLATORS: input action name
+#: src/gui/setupactiondata.h:534
 msgid "Emote modifiers keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:516
+#: src/gui/setupactiondata.h:540
 msgid "Emote modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:522
+#: src/gui/setupactiondata.h:546
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:528 src/gui/setupactiondata.h:534
-#: src/gui/setupactiondata.h:540 src/gui/setupactiondata.h:546
 #: src/gui/setupactiondata.h:552 src/gui/setupactiondata.h:558
 #: src/gui/setupactiondata.h:564 src/gui/setupactiondata.h:570
 #: src/gui/setupactiondata.h:576 src/gui/setupactiondata.h:582
@@ -2082,38 +2104,38 @@ msgstr ""
 #: src/gui/setupactiondata.h:780 src/gui/setupactiondata.h:786
 #: src/gui/setupactiondata.h:792 src/gui/setupactiondata.h:798
 #: src/gui/setupactiondata.h:804 src/gui/setupactiondata.h:810
+#: src/gui/setupactiondata.h:816 src/gui/setupactiondata.h:822
+#: src/gui/setupactiondata.h:828 src/gui/setupactiondata.h:834
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快捷键为 %d"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:825
+#: src/gui/setupactiondata.h:849
 msgid "Outfits keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:831
+#: src/gui/setupactiondata.h:855
 msgid "Wear Outfit"
 msgstr "装备套装"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:837
+#: src/gui/setupactiondata.h:861
 msgid "Copy Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:843
+#: src/gui/setupactiondata.h:867
 msgid "Copy equipped to Outfit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:849
+#: src/gui/setupactiondata.h:873
 msgid "Outfits shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:855 src/gui/setupactiondata.h:861
-#: src/gui/setupactiondata.h:867 src/gui/setupactiondata.h:873
 #: src/gui/setupactiondata.h:879 src/gui/setupactiondata.h:885
 #: src/gui/setupactiondata.h:891 src/gui/setupactiondata.h:897
 #: src/gui/setupactiondata.h:903 src/gui/setupactiondata.h:909
@@ -2136,228 +2158,228 @@ msgstr ""
 #: src/gui/setupactiondata.h:1107 src/gui/setupactiondata.h:1113
 #: src/gui/setupactiondata.h:1119 src/gui/setupactiondata.h:1125
 #: src/gui/setupactiondata.h:1131 src/gui/setupactiondata.h:1137
+#: src/gui/setupactiondata.h:1143 src/gui/setupactiondata.h:1149
+#: src/gui/setupactiondata.h:1155 src/gui/setupactiondata.h:1161
 #, c-format
 msgid "Outfit Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1152
+#: src/gui/setupactiondata.h:1176
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1158
+#: src/gui/setupactiondata.h:1182
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1164
+#: src/gui/setupactiondata.h:1188
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1170
+#: src/gui/setupactiondata.h:1194
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1176
+#: src/gui/setupactiondata.h:1200
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1182
+#: src/gui/setupactiondata.h:1206
 msgid "Close current Chat Tab"
 msgstr "关闭当前聊天标签"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1188
+#: src/gui/setupactiondata.h:1212
 msgid "Previous chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1194
+#: src/gui/setupactiondata.h:1218
 msgid "Next chat line"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1200
+#: src/gui/setupactiondata.h:1224
 msgid "Chat modifier key"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1215
+#: src/gui/setupactiondata.h:1239
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1221
+#: src/gui/setupactiondata.h:1245
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1227
+#: src/gui/setupactiondata.h:1251
 msgid "Direct Up"
 msgstr "直接向上"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1233
+#: src/gui/setupactiondata.h:1257
 msgid "Direct Down"
 msgstr "直接下"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1239
+#: src/gui/setupactiondata.h:1263
 msgid "Direct Left"
 msgstr "直接离开"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1245
+#: src/gui/setupactiondata.h:1269
 msgid "Direct Right"
 msgstr "直接对"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1251
+#: src/gui/setupactiondata.h:1275
 msgid "Crazy moves"
 msgstr "疯狂移动"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1257
+#: src/gui/setupactiondata.h:1281
 msgid "Change Crazy Move mode"
 msgstr "更改疯狂移动模式"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1263
+#: src/gui/setupactiondata.h:1287
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1269
+#: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items"
 msgstr "快速下降序号项目"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1275
+#: src/gui/setupactiondata.h:1299
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1281
+#: src/gui/setupactiondata.h:1305
 msgid "Quick heal target or self"
 msgstr "快速愈合的目标或自我"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1287
+#: src/gui/setupactiondata.h:1311
 msgid "Use #itenplz spell"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1293
+#: src/gui/setupactiondata.h:1317
 msgid "Use magic attack"
 msgstr "使用魔法攻击"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1299
+#: src/gui/setupactiondata.h:1323
 msgid "Switch magic attack"
 msgstr "切换魔法攻击"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1305
+#: src/gui/setupactiondata.h:1329
 msgid "Switch pvp attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1311
+#: src/gui/setupactiondata.h:1335
 msgid "Change move type"
 msgstr "更改移动类型"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1317
+#: src/gui/setupactiondata.h:1341
 msgid "Change Attack Weapon Type"
 msgstr "更改攻击型武器"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1323
+#: src/gui/setupactiondata.h:1347
 msgid "Change Attack Type"
 msgstr "更改攻击类型"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1329
+#: src/gui/setupactiondata.h:1353
 msgid "Change Follow mode"
 msgstr "更改跟随模式"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1335
+#: src/gui/setupactiondata.h:1359
 msgid "Change Imitation mode"
 msgstr "更改仿模式"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1341
+#: src/gui/setupactiondata.h:1365
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1347
+#: src/gui/setupactiondata.h:1371
 msgid "On / Off audio"
 msgstr "开/关 音频"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1353
+#: src/gui/setupactiondata.h:1377
 msgid "Enable / Disable away mode"
 msgstr "启用/禁用离开模式"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1359
+#: src/gui/setupactiondata.h:1383
 msgid "Emulate right click from keyboard"
 msgstr "从键盘模拟右键单击"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1365
+#: src/gui/setupactiondata.h:1389
 msgid "Toggle camera mode"
 msgstr "切换模式"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1371
+#: src/gui/setupactiondata.h:1395
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1386
+#: src/gui/setupactiondata.h:1410
 msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
 msgid "Move Up"
 msgstr "向上移动"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1422 src/gui/setupactiondata.h:1761
 msgid "Move Down"
 msgstr "向下移动"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1767
 msgid "Move Left"
 msgstr "向左移动"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1773
 msgid "Move Right"
 msgstr "向右移动"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416
+#: src/gui/setupactiondata.h:1440
 msgid "Move Forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1446
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
-#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
 #: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
 #: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
 #: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
@@ -2380,32 +2402,34 @@ msgstr ""
 #: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
 #: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
 #: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
+#: src/gui/setupactiondata.h:1716 src/gui/setupactiondata.h:1722
+#: src/gui/setupactiondata.h:1728 src/gui/setupactiondata.h:1734
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1725
+#: src/gui/setupactiondata.h:1749
 msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1779
 msgid "Move Home"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1785
 msgid "Move End"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1791
 msgid "Page up"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1797
 msgid "Page down"
 msgstr ""
 
@@ -2414,7 +2438,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
+#: src/gui/setupactiondata.h:1803 src/gui/setupactiondata.h:1948
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:329
@@ -2425,12 +2449,12 @@ msgid "Other"
 msgstr "其他"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1785
+#: src/gui/setupactiondata.h:1809
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1815
 msgid "Select2"
 msgstr ""
 
@@ -2440,7 +2464,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1827 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:106
 #: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
@@ -2449,45 +2473,45 @@ msgid "Delete"
 msgstr "删除"
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1809
+#: src/gui/setupactiondata.h:1833
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1839
 msgid "Insert"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1845
 msgid "Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1851
 msgid "Mod"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1857
 msgid "Ctrl"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1910
+#: src/gui/setupactiondata.h:1934
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1938 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr "快捷键"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1940 src/gui/widgets/tabs/setup_other.cpp:307
 #: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
@@ -2495,7 +2519,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1942 src/gui/windows/emotewindow.cpp:49
 #: src/gui/windows/emotewindow.cpp:107
 msgid "Emotes"
 msgstr ""
@@ -2503,13 +2527,13 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_chat.cpp:41
 #: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "聊天"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1926
+#: src/gui/setupactiondata.h:1950
 msgid "Gui"
 msgstr ""
 
@@ -2840,13 +2864,13 @@ msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:544
+#: src/gui/widgets/tabs/chattab.cpp:537
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:549
+#: src/gui/widgets/tabs/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2869,7 +2893,7 @@ msgstr "帮会"
 #. TRANSLATORS: guild chat help
 #. TRANSLATORS: party help message
 #: src/gui/widgets/tabs/guildchattab.cpp:63 src/net/ea/gui/guildtab.cpp:71
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /invite <nick>"
 msgstr "命令：/invite <昵称>"
 
@@ -2883,7 +2907,7 @@ msgstr ""
 #. TRANSLATORS: guild chat help
 #. TRANSLATORS: party help message
 #: src/gui/widgets/tabs/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:98
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<昵称>包含空格，请用双引号(\")括起。"
 
@@ -2891,7 +2915,7 @@ msgstr "如果<昵称>包含空格，请用双引号(\")括起。"
 #. TRANSLATORS: guild chat help
 #. TRANSLATORS: party help message
 #: src/gui/widgets/tabs/guildchattab.cpp:73 src/net/ea/gui/guildtab.cpp:81
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /leave"
 msgstr "命令：/leave"
 
@@ -2904,26 +2928,26 @@ msgstr ""
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
 #. TRANSLATORS: party help message
-#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:144
-#: src/net/ea/gui/partytab.cpp:76
+#: src/gui/widgets/tabs/guildchattab.cpp:116 src/net/ea/gui/guildtab.cpp:137
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/help > Display this help."
 msgstr "/help > 显示该帮助信息。"
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:146
+#: src/gui/widgets/tabs/guildchattab.cpp:118 src/net/ea/gui/guildtab.cpp:139
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > "
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:124 src/net/ea/gui/guildtab.cpp:148
+#: src/gui/widgets/tabs/guildchattab.cpp:120 src/net/ea/gui/guildtab.cpp:141
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > "
 
 #. TRANSLATORS: guild chat tab help
 #. TRANSLATORS: guild chat help
-#: src/gui/widgets/tabs/guildchattab.cpp:126 src/net/ea/gui/guildtab.cpp:150
+#: src/gui/widgets/tabs/guildchattab.cpp:122 src/net/ea/gui/guildtab.cpp:143
 msgid "/kick > Kick someone from the guild you are in"
 msgstr ""
 
@@ -4709,47 +4733,47 @@ msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:98
+#: src/gui/widgets/tabs/whispertab.cpp:95
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > "
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:100
+#: src/gui/widgets/tabs/whispertab.cpp:97
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > 停止忽视了其他"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:102
+#: src/gui/widgets/tabs/whispertab.cpp:99
 msgid "/close > Close the whisper tab"
 msgstr "/close > 关闭密语标签页"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:113
+#: src/gui/widgets/tabs/whispertab.cpp:110
 msgid "Command: /close"
 msgstr "命令: /close"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:115
+#: src/gui/widgets/tabs/whispertab.cpp:112
 msgid "This command closes the current whisper tab."
 msgstr "该命令关闭当前密语标签页。"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:120
+#: src/gui/widgets/tabs/whispertab.cpp:117
 msgid "Command: /ignore"
 msgstr "命令：/ignore"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:122
+#: src/gui/widgets/tabs/whispertab.cpp:119
 msgid "This command ignores the other player regardless of current relations."
 msgstr "此命令忽略了其他，不管目前的关系。"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:128
+#: src/gui/widgets/tabs/whispertab.cpp:125
 msgid "Command: /unignore <player>"
 msgstr "命令: /unignore <玩家>"
 
 #. TRANSLATORS: whisper tab help
-#: src/gui/widgets/tabs/whispertab.cpp:130
+#: src/gui/widgets/tabs/whispertab.cpp:127
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
 
@@ -5034,7 +5058,7 @@ msgstr "-"
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
 #: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1299
+#: src/gui/windows/socialwindow.cpp:1300
 msgid "Create"
 msgstr "建立"
 
@@ -6106,12 +6130,12 @@ msgid "requires v%s"
 msgstr "需要 v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:90
+#: src/gui/windows/setupwindow.cpp:90
 msgid "Apply"
 msgstr "应用"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setup.cpp:96
+#: src/gui/windows/setupwindow.cpp:96
 msgid "Reset Windows"
 msgstr "重置窗口"
 
@@ -6327,131 +6351,131 @@ msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1717
+#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
 msgid "Create Party"
 msgstr "建立"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1290
+#: src/gui/windows/socialwindow.cpp:1291
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1295
+#: src/gui/windows/socialwindow.cpp:1296
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/socialwindow.cpp:1302
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1493
+#: src/gui/windows/socialwindow.cpp:1496
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1504
+#: src/gui/windows/socialwindow.cpp:1507
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1521
+#: src/gui/windows/socialwindow.cpp:1524
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1535
+#: src/gui/windows/socialwindow.cpp:1538
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1575
+#: src/gui/windows/socialwindow.cpp:1578
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1596
+#: src/gui/windows/socialwindow.cpp:1599
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1611
+#: src/gui/windows/socialwindow.cpp:1614
 msgid "Guild Name"
 msgstr "公会名称"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1613
+#: src/gui/windows/socialwindow.cpp:1616
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1629
+#: src/gui/windows/socialwindow.cpp:1632
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1637
+#: src/gui/windows/socialwindow.cpp:1640
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1644
+#: src/gui/windows/socialwindow.cpp:1647
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1660
+#: src/gui/windows/socialwindow.cpp:1663
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1672
+#: src/gui/windows/socialwindow.cpp:1675
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1677
+#: src/gui/windows/socialwindow.cpp:1680
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1686
+#: src/gui/windows/socialwindow.cpp:1689
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1692
+#: src/gui/windows/socialwindow.cpp:1695
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1705
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/windows/socialwindow.cpp:1718
+#: src/gui/windows/socialwindow.cpp:1721
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1724
+#: src/gui/windows/socialwindow.cpp:1727
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1726
+#: src/gui/windows/socialwindow.cpp:1729
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
@@ -7060,51 +7084,51 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:78
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > 邀请某一玩家加入您的帮会"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:80
+#: src/net/ea/gui/partytab.cpp:77
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > 离开你所在的帮会"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:79
 msgid "/kick > Kick someone from the party you are in"
 msgstr ""
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:81
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > 显示/改变帮会项目共享选项"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:83
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > 显示/改变帮会经验共享选项"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command invites <nick> to party with you."
 msgstr "该命令邀请<昵称>和你聚会。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:109
+#: src/net/ea/gui/partytab.cpp:106
 msgid "This command causes the player to leave the party."
 msgstr "该命令致使玩家离开帮会"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:111
 msgid "Command: /item <policy>"
 msgstr "命令：/item <策略>"
 
-#: src/net/ea/gui/partytab.cpp:117
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command changes the party's item sharing policy."
 msgstr "改命令改变帮会的物品共享策略。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:119
+#: src/net/ea/gui/partytab.cpp:116
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -7113,27 +7137,27 @@ msgstr ""
 "\"false\"用来禁止物品共享。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:123
+#: src/net/ea/gui/partytab.cpp:120
 msgid "Command: /item"
 msgstr "命令：/item"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:125
+#: src/net/ea/gui/partytab.cpp:122
 msgid "This command displays the party's current item sharing policy."
 msgstr "该命令显示帮会现有的物品共享策略。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:131
+#: src/net/ea/gui/partytab.cpp:128
 msgid "Command: /exp <policy>"
 msgstr "命令：/exp <策略>"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:133
+#: src/net/ea/gui/partytab.cpp:130
 msgid "This command changes the party's experience sharing policy."
 msgstr "该命令改变帮会的经验共享策略。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:136
+#: src/net/ea/gui/partytab.cpp:133
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -7142,58 +7166,58 @@ msgstr ""
 "\"false\"用来关闭经验共享。"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:140
+#: src/net/ea/gui/partytab.cpp:137
 msgid "Command: /exp"
 msgstr "命令：/exp"
 
 #. TRANSLATORS: party help message
-#: src/net/ea/gui/partytab.cpp:142
+#: src/net/ea/gui/partytab.cpp:139
 msgid "This command displays the party's current experience sharing policy."
 msgstr "该命令显示帮会现有的经验共享策略。"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:182 src/notifications.h:237
+#: src/net/ea/gui/partytab.cpp:179 src/notifications.h:237
 msgid "Item sharing enabled."
 msgstr "物品共享开启。"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:186 src/notifications.h:240
+#: src/net/ea/gui/partytab.cpp:183 src/notifications.h:240
 msgid "Item sharing disabled."
 msgstr "物品共享关闭。"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:190 src/notifications.h:243
+#: src/net/ea/gui/partytab.cpp:187 src/notifications.h:243
 msgid "Item sharing not possible."
 msgstr "物品共享不可能。"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:194
+#: src/net/ea/gui/partytab.cpp:191
 msgid "Item sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:226 src/notifications.h:228
+#: src/net/ea/gui/partytab.cpp:223 src/notifications.h:228
 msgid "Experience sharing enabled."
 msgstr "经验共享开启。"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:230 src/notifications.h:231
+#: src/net/ea/gui/partytab.cpp:227 src/notifications.h:231
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭。"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:234 src/notifications.h:234
+#: src/net/ea/gui/partytab.cpp:231 src/notifications.h:234
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能。"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:238
+#: src/net/ea/gui/partytab.cpp:235
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7989,6 +8013,3 @@ msgstr "未知物品"
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
 msgstr ""
-
-#~ msgid "Stop Attack"
-#~ msgstr "停止攻击"
-- 
cgit v1.2.3-70-g09d2