summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-20 19:41:30 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-20 19:41:30 +0300
commite17630addbca1f438c17a4b19ede10717d111aa0 (patch)
tree63beea9d9824772cb735ab28733a023103b840d6 /po/zh_CN.po
parent9aae08f9e2f869b0f4bfa446404b01a8d3b2d60f (diff)
downloadplus-e17630addbca1f438c17a4b19ede10717d111aa0.tar.gz
plus-e17630addbca1f438c17a4b19ede10717d111aa0.tar.bz2
plus-e17630addbca1f438c17a4b19ede10717d111aa0.tar.xz
plus-e17630addbca1f438c17a4b19ede10717d111aa0.zip
Update translations.
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po708
1 files changed, 370 insertions, 338 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6ec691f9e..cbd188998 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-07 13:56+0300\n"
-"PO-Revision-Date: 2016-04-24 08:27+0000\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
+"PO-Revision-Date: 2016-05-08 09:45+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
"language/zh_CN/)\n"
@@ -40,7 +40,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:169 src/client.cpp:1534 src/client.cpp:1569
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
#: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -54,8 +54,8 @@ msgstr ""
#: src/gui/windows/charcreatedialog.cpp:472
#: src/gui/windows/charselectdialog.cpp:262
#: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/editserverdialog.cpp:215
+#: src/gui/windows/editserverdialog.cpp:59
+#: src/gui/windows/editserverdialog.cpp:217
#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
#: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
@@ -177,7 +177,13 @@ msgid "Message now closes chat."
msgstr "讯息现在关闭聊天."
#. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:612
+#: src/actions/chat.cpp:614
+#, fuzzy
+msgid "no hat equipped."
+msgstr "无法装备."
+
+#. TRANSLATORS: equipped hat chat message
+#: src/actions/chat.cpp:620
#, c-format
msgid "equipped hat %s."
msgstr ""
@@ -304,84 +310,84 @@ msgid "Visible on map"
msgstr "在地图上可见"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:492
+#: src/being/being.cpp:494
msgid "Human"
msgstr ""
#. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:670
+#: src/being/being.cpp:672
msgid "dodge"
msgstr "躲闪"
-#: src/being/being.cpp:670
+#: src/being/being.cpp:672
msgid "miss"
msgstr "失误"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2269 src/gui/windows/whoisonline.cpp:881
+#: src/being/being.cpp:2271 src/gui/windows/whoisonline.cpp:881
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2274 src/gui/windows/whoisonline.cpp:886
+#: src/being/being.cpp:2276 src/gui/windows/whoisonline.cpp:886
msgid "I"
msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:388 src/net/eathena/playerrecv.cpp:454
+#: src/being/localplayer.cpp:390 src/net/eathena/playerrecv.cpp:454
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:869
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:873
msgid "Item is too heavy."
msgstr "项目是太重了."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:875
+#: src/being/localplayer.cpp:877
msgid "Item is too far away."
msgstr "物品太远了."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:879
+#: src/being/localplayer.cpp:881
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:883
+#: src/being/localplayer.cpp:885
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:887
+#: src/being/localplayer.cpp:889
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:891
+#: src/being/localplayer.cpp:893
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:897
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:904
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:926
+#: src/being/localplayer.cpp:928
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -389,53 +395,53 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1099 src/being/localplayer.cpp:1101
-#: src/being/localplayer.cpp:1127
+#: src/being/localplayer.cpp:1103 src/being/localplayer.cpp:1105
+#: src/being/localplayer.cpp:1131
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1105 src/being/localplayer.cpp:1111
-#: src/being/localplayer.cpp:1117
+#: src/being/localplayer.cpp:1109 src/being/localplayer.cpp:1115
+#: src/being/localplayer.cpp:1121
msgid "job"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1136
+#: src/being/localplayer.cpp:1140
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1145
+#: src/being/localplayer.cpp:1149
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2230
+#: src/being/localplayer.cpp:2234
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2236 src/being/localplayer.cpp:2261
+#: src/being/localplayer.cpp:2240 src/being/localplayer.cpp:2265
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2246
+#: src/being/localplayer.cpp:2250
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2252 src/being/localplayer.cpp:2266
+#: src/being/localplayer.cpp:2256 src/being/localplayer.cpp:2270
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2611
+#: src/being/localplayer.cpp:2615
#, c-format
msgid "You see %s"
msgstr ""
@@ -445,8 +451,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2447
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:2526
msgid "Completely ignore"
msgstr "完全忽略"
@@ -473,41 +479,41 @@ msgstr "流动的泡沫"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: long button name for setup window.
#. TRANSLATORS: setup window name
-#: src/client.cpp:844 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
#: src/gui/windows/setupwindow.cpp:65
msgid "Setup"
msgstr "设置"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:847 src/dyetool/client.cpp:485
+#: src/client.cpp:855 src/dyetool/client.cpp:485
#: src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:850 src/dyetool/client.cpp:488
+#: src/client.cpp:858 src/dyetool/client.cpp:488
#: src/gui/widgets/tabs/setup_video.cpp:106
msgid "Video"
msgstr "视频"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:853 src/dyetool/client.cpp:491
+#: src/client.cpp:861 src/dyetool/client.cpp:491
#: src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "主题"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:856 src/dyetool/client.cpp:494
+#: src/client.cpp:864 src/dyetool/client.cpp:494
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: long button name for help window.
#. TRANSLATORS: help window name
-#: src/client.cpp:859 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "帮助"
@@ -528,7 +534,7 @@ msgstr "帮助"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:863 src/client.cpp:1448 src/client.cpp:1467
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
#: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
#: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
@@ -541,32 +547,32 @@ msgid "Close"
msgstr "关闭"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1088 src/gui/windowmanager_unittest.cc:151
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
msgid "Connecting to server"
msgstr "正在连接服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1145 src/gui/windowmanager_unittest.cc:168
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
msgid "Logging in"
msgstr "登录中"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1194
+#: src/client.cpp:1202
msgid "Entering game world"
msgstr "进入游戏世界"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1349
msgid "Requesting characters"
msgstr "请求角色"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1392
msgid "Connecting to the game server"
msgstr "正在连接游戏服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1389
+#: src/client.cpp:1404
msgid "Changing game servers"
msgstr "正在更改游戏服务器"
@@ -583,12 +589,12 @@ msgstr "正在更改游戏服务器"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1445 src/client.cpp:1464 src/client.cpp:1703
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:468
#: src/gui/windows/charselectdialog.cpp:306
-#: src/gui/windows/editserverdialog.cpp:210
+#: src/gui/windows/editserverdialog.cpp:212
#: src/gui/windows/registerdialog.cpp:256
#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
#: src/net/eathena/charserverrecv.cpp:378
@@ -598,37 +604,37 @@ msgid "Error"
msgstr "错误"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1498
msgid "Requesting registration details"
msgstr "正在请求详细注册信息"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1530
+#: src/client.cpp:1545
msgid "Password Change"
msgstr "更改密码"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1532
+#: src/client.cpp:1547
msgid "Password changed successfully!"
msgstr "密码更改成功!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1580
msgid "Email Change"
msgstr "更改电子邮箱地址"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1582
msgid "Email changed successfully!"
msgstr "电子邮箱地址更改成功!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1603
+#: src/client.cpp:1618
msgid "Unregister Successful"
msgstr "取消注册成功"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1605
+#: src/client.cpp:1620
msgid "Farewell, come back any time..."
msgstr "再见,欢迎随时回来..."
@@ -1245,7 +1251,7 @@ msgstr "讯息"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2826
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2863
msgid "Revive"
msgstr ""
@@ -1430,8 +1436,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2108
-#: src/gui/popups/popupmenu.cpp:2188 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2145
+#: src/gui/popups/popupmenu.cpp:2225 src/gui/widgets/tabs/socialtabbase.h:46
msgid "(default)"
msgstr "(默认)"
@@ -1762,21 +1768,22 @@ msgstr "建立"
#: src/gui/popups/popupmenu.cpp:754 src/gui/popups/popupmenu.cpp:779
#: src/gui/popups/popupmenu.cpp:804 src/gui/popups/popupmenu.cpp:1001
#: src/gui/popups/popupmenu.cpp:1028 src/gui/popups/popupmenu.cpp:1066
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1865
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/popups/popupmenu.cpp:1972
-#: src/gui/popups/popupmenu.cpp:2013 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2165 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2234 src/gui/popups/popupmenu.cpp:2255
-#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2351
-#: src/gui/popups/popupmenu.cpp:2671 src/gui/popups/popupmenu.cpp:2799
-#: src/gui/popups/popupmenu.cpp:3001 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3176 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1862
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:2009 src/gui/popups/popupmenu.cpp:2050
+#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2271
+#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/popupmenu.cpp:2314
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2836 src/gui/popups/popupmenu.cpp:3038
+#: src/gui/popups/popupmenu.cpp:3180 src/gui/popups/popupmenu.cpp:3213
+#: src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:56
#: src/gui/windows/changepassworddialog.cpp:58
#: src/gui/windows/charcreatedialog.cpp:114
#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:59
+#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/quitdialog.cpp:69
#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
#: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:60
@@ -1842,7 +1849,7 @@ msgstr "密语"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:910
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2928
msgid "Heal"
msgstr "愈合"
@@ -1871,7 +1878,7 @@ msgstr ""
#. TRANSLATORS: set player invisible for self by id
#. TRANSLATORS: popup menu item
#. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2899
msgid "Nuke"
msgstr ""
@@ -1900,7 +1907,7 @@ msgstr "移动"
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
#: src/gui/popups/popupmenu.cpp:269 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/resources/db/npcdb.cpp:151
msgid "Talk"
msgstr "说话"
@@ -1914,11 +1921,11 @@ msgstr "说话"
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2519
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2556
#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
msgid "Buy"
msgstr "购买"
@@ -1932,11 +1939,11 @@ msgstr "购买"
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:282 src/gui/popups/popupmenu.cpp:2531
+#: src/gui/popups/popupmenu.cpp:282 src/gui/popups/popupmenu.cpp:2568
#: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
#: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
msgid "Sell"
msgstr "出售"
@@ -1945,7 +1952,7 @@ msgstr "出售"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:292 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2668
msgid "Add comment"
msgstr "发表评论"
@@ -1971,7 +1978,7 @@ msgstr "加入攻击清单"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:333 src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:333 src/gui/popups/popupmenu.cpp:2690
msgid "Add to ignore list"
msgstr ""
@@ -2011,7 +2018,7 @@ msgstr "重命名"
#. TRANSLATORS: delete homunculus
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:371 src/gui/popups/popupmenu.cpp:2865
+#: src/gui/popups/popupmenu.cpp:371 src/gui/popups/popupmenu.cpp:2902
msgid "Kill"
msgstr ""
@@ -2038,7 +2045,7 @@ msgstr "卸下装备"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:407 src/resources/db/petdb.cpp:156
+#: src/gui/popups/popupmenu.cpp:407 src/resources/db/petdb.cpp:159
msgid "Return to egg"
msgstr ""
@@ -2058,8 +2065,8 @@ msgstr "玩家"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:565 src/gui/popups/popupmenu.cpp:2572
-#: src/gui/popups/popupmenu.cpp:2597
+#: src/gui/popups/popupmenu.cpp:565 src/gui/popups/popupmenu.cpp:2609
+#: src/gui/popups/popupmenu.cpp:2634
msgid "Kick from party"
msgstr "踢从党"
@@ -2071,9 +2078,9 @@ msgstr "拾取"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:1821
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1956
-#: src/gui/popups/popupmenu.cpp:2229
+#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:1858
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2266
msgid "Add to chat"
msgstr "加入聊天"
@@ -2088,8 +2095,8 @@ msgstr "地图项"
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2161
-#: src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2198
+#: src/gui/popups/popupmenu.cpp:2234
msgid "Remove"
msgstr ""
@@ -2192,8 +2199,8 @@ msgstr "留下"
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:880 src/gui/popups/popupmenu.cpp:2273
-#: src/gui/popups/popupmenu.cpp:2317
+#: src/gui/popups/popupmenu.cpp:880 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2354
msgid "Copy to clipboard"
msgstr ""
@@ -2219,57 +2226,91 @@ msgstr ""
msgid "Lock"
msgstr ""
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:1106
+#, fuzzy
+msgid "Show emotes for:"
+msgstr "显示怪物HP栏"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: show emotes for player
+#. TRANSLATORS: settings group
+#: src/gui/popups/popupmenu.cpp:1110 src/gui/widgets/tabs/setup_other.cpp:226
+msgid "Player"
+msgstr "玩家"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: show emotes for pet
+#: src/gui/popups/popupmenu.cpp:1114
+#, fuzzy
+msgid "Pet"
+msgstr "宠物"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: show emotes for homuncules
+#. TRANSLATORS: palette color
+#: src/gui/popups/popupmenu.cpp:1121 src/gui/userpalette.cpp:200
+msgid "Homunculus"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: show emotes for mercenary
+#. TRANSLATORS: palette color
+#: src/gui/popups/popupmenu.cpp:1125 src/gui/userpalette.cpp:195
+msgid "Mercenary"
+msgstr ""
+
#. TRANSLATORS: dialog caption
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1145
+#: src/gui/popups/popupmenu.cpp:1182
msgid "Rename map sign "
msgstr "重命名的地图标志 "
#. TRANSLATORS: label
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1148
+#: src/gui/popups/popupmenu.cpp:1185
msgid "Name: "
msgstr "名称: "
#. TRANSLATORS: dialog caption
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1163
+#: src/gui/popups/popupmenu.cpp:1200
msgid "Player comment "
msgstr "玩家评论 "
#. TRANSLATORS: label
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1166
+#: src/gui/popups/popupmenu.cpp:1203
msgid "Comment: "
msgstr "评论: "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1734
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1705
+#: src/gui/popups/popupmenu.cpp:1742
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1747
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1714
+#: src/gui/popups/popupmenu.cpp:1751
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1718
+#: src/gui/popups/popupmenu.cpp:1755
msgid "Add to trade all"
msgstr ""
@@ -2278,8 +2319,8 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1726 src/gui/popups/popupmenu.cpp:1904
-#: src/gui/popups/popupmenu.cpp:1951 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1941
+#: src/gui/popups/popupmenu.cpp:1988 src/gui/windows/inventorywindow.cpp:268
#: src/gui/windows/inventorywindow.cpp:292
#: src/gui/windows/inventorywindow.cpp:917 src/gui/windows/setupwindow.cpp:102
msgid "Store"
@@ -2287,63 +2328,63 @@ msgstr "存储"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1734
+#: src/gui/popups/popupmenu.cpp:1771
msgid "Store 10"
msgstr "商店10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1739
+#: src/gui/popups/popupmenu.cpp:1776
msgid "Store half"
msgstr "商店的一半"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1743
+#: src/gui/popups/popupmenu.cpp:1780
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1747
+#: src/gui/popups/popupmenu.cpp:1784
msgid "Store all"
msgstr "商店所有"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1761
+#: src/gui/popups/popupmenu.cpp:1798
msgid "Move to craft..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/windows/inventorywindow.cpp:270
#: src/gui/windows/inventorywindow.cpp:294
msgid "Retrieve"
msgstr "取回"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1816
msgid "Retrieve 10"
msgstr "拿出10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1784
+#: src/gui/popups/popupmenu.cpp:1821
msgid "Retrieve half"
msgstr "拿出一半"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1788
+#: src/gui/popups/popupmenu.cpp:1825
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1829
msgid "Retrieve all"
msgstr "检索所有"
@@ -2354,17 +2395,17 @@ msgstr "检索所有"
#. TRANSLATORS: default use button name
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1858 src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2762
#: src/gui/windows/inventorywindow.cpp:206
#: src/gui/windows/inventorywindow.cpp:804 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
-#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
+#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:341
+#: src/gui/windows/skilldialog.cpp:516 src/gui/windows/skilldialog.cpp:603
#: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
msgid "Use"
msgstr "使用"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1968
+#: src/gui/popups/popupmenu.cpp:2005
msgid "Clear drop window"
msgstr ""
@@ -2373,43 +2414,43 @@ msgstr ""
#. TRANSLATORS: hide player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:1999 src/gui/popups/popupmenu.cpp:2061
-#: src/gui/popups/popupmenu.cpp:2883 src/gui/popups/popupmenu.cpp:2903
-#: src/gui/popups/popupmenu.cpp:3017
+#: src/gui/popups/popupmenu.cpp:2036 src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:2920 src/gui/popups/popupmenu.cpp:2940
+#: src/gui/popups/popupmenu.cpp:3054
msgid "Hide"
msgstr "隐藏"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2105
msgid "Show"
msgstr "显示"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2075
+#: src/gui/popups/popupmenu.cpp:2112
msgid "Open yellow bar settings"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2114
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2081 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2118 src/gui/windows/statuswindow.cpp:88
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2180
msgid "Move up"
msgstr "x"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2130 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:2167 src/gui/popups/popupmenu.cpp:2186
msgid "Move down"
msgstr ""
@@ -2417,30 +2458,30 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2226 src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2665
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2285
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2288
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2307
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2325
msgid "Show window"
msgstr ""
@@ -2448,7 +2489,7 @@ msgstr ""
#. TRANSLATORS: skill level
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2379 src/gui/popups/skillpopup.cpp:127
#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:68
#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:367
#, c-format
@@ -2457,135 +2498,135 @@ msgstr "等级:%d"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2384
msgid "Max level"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2393 src/gui/popups/popupmenu.cpp:2429
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2433 src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/windows/confirmdialog.cpp:62
msgid "Ignore"
msgstr "忽略"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2399 src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:2436 src/gui/popups/popupmenu.cpp:2511
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2402 src/gui/popups/popupmenu.cpp:2435
+#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2472
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2405 src/gui/popups/popupmenu.cpp:2438
-#: src/gui/popups/popupmenu.cpp:2450 src/gui/popups/popupmenu.cpp:2459
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:2452
msgid "Be friend"
msgstr "是朋友"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2426 src/gui/popups/popupmenu.cpp:2444
-#: src/gui/popups/popupmenu.cpp:2456 src/gui/popups/popupmenu.cpp:2465
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2481
+#: src/gui/popups/popupmenu.cpp:2493 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2520
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2539
msgid "Follow"
msgstr "按照"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2506
+#: src/gui/popups/popupmenu.cpp:2543
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2525 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2562 src/gui/popups/popupmenu.cpp:2586
msgid "Buy (?)"
msgstr "购买(?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2589
msgid "Sell (?)"
msgstr "出售(?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2566 src/gui/popups/popupmenu.cpp:2591
+#: src/gui/popups/popupmenu.cpp:2603 src/gui/popups/popupmenu.cpp:2628
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2653
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2662
msgid "Show Items"
msgstr "显示项目"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2679
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2649
+#: src/gui/popups/popupmenu.cpp:2686
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2738
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2747
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2740 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2777 src/gui/windows/inventorywindow.cpp:221
#: src/gui/windows/inventorywindow.cpp:925
msgid "Drop..."
msgstr "掉落..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2780
msgid "Drop all"
msgstr "所有"
@@ -2593,38 +2634,38 @@ msgstr "所有"
#. TRANSLATORS: drop item
#. TRANSLATORS: long button name for drops window.
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2786 src/gui/windowmenu.cpp:140
#: src/gui/windows/inventorywindow.cpp:930
msgid "Drop"
msgstr "丢弃"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2760
+#: src/gui/popups/popupmenu.cpp:2797
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:2805
#, c-format
msgid "Show %s"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2772
+#: src/gui/popups/popupmenu.cpp:2809
msgid "Account info"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2775
+#: src/gui/popups/popupmenu.cpp:2812
msgid "Level"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2815
msgid "Stats"
msgstr ""
@@ -2633,7 +2674,7 @@ msgstr ""
#. TRANSLATORS: long button name for inventory window.
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2781 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2818 src/gui/windowmenu.cpp:106
#: src/gui/windows/inventorywindow.cpp:152
#: src/resources/inventory/inventory.cpp:330
msgid "Inventory"
@@ -2642,7 +2683,7 @@ msgstr "物品栏"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player storage list
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2784 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2821 src/resources/inventory/inventory.cpp:335
msgid "Storage"
msgstr "仓库"
@@ -2651,7 +2692,7 @@ msgstr "仓库"
#. TRANSLATORS: long button name for cart window.
#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2787 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2824 src/gui/windowmenu.cpp:110
#: src/gui/windows/inventorywindow.cpp:239
#: src/resources/inventory/inventory.cpp:346
msgid "Cart"
@@ -2660,31 +2701,31 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
#. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2790 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2827 src/gui/widgets/tabs/setup_chat.cpp:87
msgid "Commands"
msgstr "命令"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2830
msgid "Char commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2796 src/gui/popups/popupmenu.cpp:2998
+#: src/gui/popups/popupmenu.cpp:2833 src/gui/popups/popupmenu.cpp:3035
msgid "Back"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2847
msgid "Locate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2816
+#: src/gui/popups/popupmenu.cpp:2853
msgid "Check ip"
msgstr ""
@@ -2692,7 +2733,7 @@ msgstr ""
#. TRANSLATORS: go to player position
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2820 src/gui/popups/popupmenu.cpp:3028
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/popups/popupmenu.cpp:3065
msgid "Goto"
msgstr ""
@@ -2700,109 +2741,109 @@ msgstr ""
#. TRANSLATORS: recall player to current position
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2823 src/gui/popups/popupmenu.cpp:3022
+#: src/gui/popups/popupmenu.cpp:2860 src/gui/popups/popupmenu.cpp:3059
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2875
msgid "Recall party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2882
msgid "Recall guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2893
msgid "Give party leader"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2871
+#: src/gui/popups/popupmenu.cpp:2908
msgid "Show..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2911
msgid "Mute..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2931
msgid "Immortal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2897
+#: src/gui/popups/popupmenu.cpp:2934
msgid "Jail"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2900
+#: src/gui/popups/popupmenu.cpp:2937
msgid "Unjail"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2907
+#: src/gui/popups/popupmenu.cpp:2944
msgid "Killer"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2910
+#: src/gui/popups/popupmenu.cpp:2947
msgid "Killable"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:2950
msgid "Set save"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2916
+#: src/gui/popups/popupmenu.cpp:2953
msgid "Warp to save"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2919
+#: src/gui/popups/popupmenu.cpp:2956
msgid "Warp to random"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2923
+#: src/gui/popups/popupmenu.cpp:2960
msgid "Spawn clone"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2926
+#: src/gui/popups/popupmenu.cpp:2963
msgid "Spawn slave clone"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2929
+#: src/gui/popups/popupmenu.cpp:2966
msgid "Spawn evil clone"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:2970
msgid "Break guild"
msgstr ""
@@ -2810,31 +2851,31 @@ msgstr ""
#. TRANSLATORS: kick player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:2940 src/gui/popups/popupmenu.cpp:3011
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:2977 src/gui/popups/popupmenu.cpp:3048
+#: src/gui/popups/popupmenu.cpp:3077
msgid "Kick"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2948
+#: src/gui/popups/popupmenu.cpp:2985
#, c-format
msgid "Mute %s"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2956 src/gui/popups/popupmenu.cpp:2960
-#: src/gui/popups/popupmenu.cpp:2964 src/gui/popups/popupmenu.cpp:2968
-#: src/gui/popups/popupmenu.cpp:2972
+#: src/gui/popups/popupmenu.cpp:2993 src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3001 src/gui/popups/popupmenu.cpp:3005
+#: src/gui/popups/popupmenu.cpp:3009
#, c-format
msgid "Mute %d"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2977 src/gui/popups/popupmenu.cpp:2981
-#: src/gui/popups/popupmenu.cpp:2985 src/gui/popups/popupmenu.cpp:2989
-#: src/gui/popups/popupmenu.cpp:2993
+#: src/gui/popups/popupmenu.cpp:3014 src/gui/popups/popupmenu.cpp:3018
+#: src/gui/popups/popupmenu.cpp:3022 src/gui/popups/popupmenu.cpp:3026
+#: src/gui/popups/popupmenu.cpp:3030
#, c-format
msgid "Unmute %d"
msgstr ""
@@ -2843,19 +2884,19 @@ msgstr ""
#. TRANSLATORS: disguise to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3025 src/gui/popups/popupmenu.cpp:3052
+#: src/gui/popups/popupmenu.cpp:3062 src/gui/popups/popupmenu.cpp:3089
msgid "Disguise"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3043
+#: src/gui/popups/popupmenu.cpp:3080
msgid "Spawn same"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3049
+#: src/gui/popups/popupmenu.cpp:3086
msgid "Spawn slave"
msgstr ""
@@ -2867,8 +2908,8 @@ msgstr ""
#. TRANSLATORS: info message header
#. TRANSLATORS: info header
#. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3056 src/gui/popups/popupmenu.cpp:3075
-#: src/gui/popups/popupmenu.cpp:3088 src/gui/windows/charselectdialog.cpp:76
+#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
+#: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
#: src/net/eathena/charserverrecv.cpp:437
msgid "Info"
@@ -2876,49 +2917,49 @@ msgstr "信息"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3059
+#: src/gui/popups/popupmenu.cpp:3096
msgid "Search"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3063
+#: src/gui/popups/popupmenu.cpp:3100
msgid "Search spawns"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3078 src/gui/popups/popupmenu.cpp:3091
+#: src/gui/popups/popupmenu.cpp:3115 src/gui/popups/popupmenu.cpp:3128
msgid "Who drops"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3098
+#: src/gui/popups/popupmenu.cpp:3135
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3171
+#: src/gui/popups/popupmenu.cpp:3208
#, c-format
msgid "Move to craft %d"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3190
+#: src/gui/popups/popupmenu.cpp:3227
msgid "Mail to..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3201
+#: src/gui/popups/popupmenu.cpp:3238
msgid "Taming pet"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3212
+#: src/gui/popups/popupmenu.cpp:3249
msgid "Adopt child"
msgstr ""
@@ -2948,7 +2989,7 @@ msgstr "快捷键"
#. TRANSLATORS: settings group
#. TRANSLATORS: long button name for windows list menu.
#. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_other.cpp:335
#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
msgid "Windows"
msgstr ""
@@ -2985,7 +3026,7 @@ msgstr "聊天"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:383
#: src/gui/widgets/tabs/setup_audio.cpp:155
#: src/gui/widgets/tabs/setup_chat.cpp:294
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:357
#: src/gui/widgets/tabs/setup_visual.cpp:203
#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
@@ -3059,16 +3100,6 @@ msgid "Pets"
msgstr "宠物"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:195
-msgid "Mercenary"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Homunculus"
-msgstr ""
-
-#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:205
msgid "Skill unit"
msgstr ""
@@ -3371,7 +3402,7 @@ msgstr "编辑"
#. TRANSLATORS: skill level
#. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:511
#, c-format
msgid "Lvl: %d"
msgstr "等级: %d"
@@ -4497,7 +4528,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:204
+#: src/gui/windows/questswindow.cpp:207
msgid "unknown"
msgstr ""
@@ -4760,76 +4791,77 @@ msgstr "同步播放移动"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:212
+#, fuzzy
+msgid "Sync player move distance"
+msgstr "同步播放移动"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:217
msgid "Crazy move A program"
msgstr "疯狂的举动的程序"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:216
+#: src/gui/widgets/tabs/setup_other.cpp:221
msgid "Mouse relative moves (good for touch interfaces)"
msgstr ""
-#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:221
-msgid "Player"
-msgstr "玩家"
-
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:224
+#: src/gui/widgets/tabs/setup_other.cpp:229
msgid "Show own hp bar"
msgstr "显示自己的HP栏"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:228
+#: src/gui/widgets/tabs/setup_other.cpp:233
msgid "Enable quick stats"
msgstr "启用快速统计"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:232
+#: src/gui/widgets/tabs/setup_other.cpp:237
msgid "Cycle player targets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:236
+#: src/gui/widgets/tabs/setup_other.cpp:241
msgid "Show job exp messages"
msgstr "显示工作EXP消息"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:240
+#: src/gui/widgets/tabs/setup_other.cpp:245
msgid "Show players popups"
msgstr "显示球员弹出窗口"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:244
+#: src/gui/widgets/tabs/setup_other.cpp:249
msgid "Afk message"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:254
msgid "Show job"
msgstr "显示工作"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:254
+#: src/gui/widgets/tabs/setup_other.cpp:259
msgid "Enable attack filter"
msgstr "启用攻击过滤器"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:263
msgid "Enable pickup filter"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:267
msgid "Enable advert protocol"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:266
+#: src/gui/widgets/tabs/setup_other.cpp:271
msgid "Enabled pets support"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:275
msgid "Enable weight notifications"
msgstr ""
@@ -4837,181 +4869,181 @@ msgstr ""
#. TRANSLATORS: long button name for shop window.
#. TRANSLATORS: shop window name
#. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:280 src/gui/windowmenu.cpp:150
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
#: src/gui/windows/inventorywindow.cpp:241
msgid "Shop"
msgstr "商店"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:278
+#: src/gui/widgets/tabs/setup_other.cpp:283
msgid "Accept sell/buy requests"
msgstr "接受出售/购买请求"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:287
msgid "Enable shop mode"
msgstr "启用商店模式"
#. TRANSLATORS: settings group
#. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
msgid "NPC"
msgstr "NPC"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:295
msgid "Cycle npc targets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:294
+#: src/gui/widgets/tabs/setup_other.cpp:299
msgid "Log NPC dialogue"
msgstr "NPC对话"
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:304
msgid "Bots support"
msgstr "挂机支持"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/widgets/tabs/setup_other.cpp:313
msgid "Enable manamarket bot support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:320
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:318
+#: src/gui/widgets/tabs/setup_other.cpp:323
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:322
+#: src/gui/widgets/tabs/setup_other.cpp:327
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:331
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:339
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:343
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:347
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:355
+#: src/gui/widgets/tabs/setup_other.cpp:360
msgid "Enable server side attack"
msgstr "启用服务器端的攻击"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:359
+#: src/gui/widgets/tabs/setup_other.cpp:364
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:368
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:372
msgid "Enable bot checker"
msgstr "启用挂机检查"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:376
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:382
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:382
+#: src/gui/widgets/tabs/setup_other.cpp:387
msgid "Enable debug log"
msgstr "启用调试日志"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:386
+#: src/gui/widgets/tabs/setup_other.cpp:391
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:395
msgid "Log unimplimented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:399
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:398
+#: src/gui/widgets/tabs/setup_other.cpp:403
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:402 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:407 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:406
+#: src/gui/widgets/tabs/setup_other.cpp:411
msgid "Low traffic mode"
msgstr "低流量模式"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:411
+#: src/gui/widgets/tabs/setup_other.cpp:416
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:417
+#: src/gui/widgets/tabs/setup_other.cpp:422
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:424
+#: src/gui/widgets/tabs/setup_other.cpp:429
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:428
+#: src/gui/widgets/tabs/setup_other.cpp:433
msgid "Show background"
msgstr "显示背景"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:433
+#: src/gui/widgets/tabs/setup_other.cpp:438
msgid "Screen density override"
msgstr ""
@@ -6222,7 +6254,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/editserverdialog.cpp:72 src/gui/windows/logindialog.cpp:108
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:108
#: src/gui/windows/registerdialog.cpp:73
msgid "Name:"
msgstr "姓名:"
@@ -6481,53 +6513,53 @@ msgid "Auto open this window"
msgstr "自动打开这个窗口"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:45
+#: src/gui/windows/editserverdialog.cpp:47
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:55 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
msgid "Connect"
msgstr "连接"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/editserverdialog.cpp:63
msgid "Use same ip"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:74
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:76
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Port:"
msgstr "端口:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:78
+#: src/gui/windows/editserverdialog.cpp:80
msgid "Server type:"
msgstr "服务器类型:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:82
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:82
+#: src/gui/windows/editserverdialog.cpp:84
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:84
+#: src/gui/windows/editserverdialog.cpp:86
msgid "Packet version:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/editserverdialog.cpp:214
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -7023,22 +7055,22 @@ msgid "Away outfit"
msgstr ""
#. TRANSLATORS: quest reward
-#: src/gui/windows/questswindow.cpp:474
+#: src/gui/windows/questswindow.cpp:477
msgid "Reward:"
msgstr ""
#. TRANSLATORS: quest giver name
-#: src/gui/windows/questswindow.cpp:481
+#: src/gui/windows/questswindow.cpp:484
msgid "Quest Giver:"
msgstr ""
#. TRANSLATORS: quest npc name
-#: src/gui/windows/questswindow.cpp:488
+#: src/gui/windows/questswindow.cpp:491
msgid "Npc:"
msgstr ""
#. TRANSLATORS: quest coordinates
-#: src/gui/windows/questswindow.cpp:496
+#: src/gui/windows/questswindow.cpp:499
msgid "Coordinates:"
msgstr ""
@@ -7261,31 +7293,31 @@ msgid "Skill points available: %d"
msgstr "技能点:%d个"
#. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:308
#, c-format
msgid "Skill Set %d"
msgstr ""
#. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:329
#, c-format
msgid "Skill %d"
msgstr "技能为%d"
#. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:518
#, c-format
msgid "Failed skill: %s"
msgstr ""
#. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:807
+#: src/gui/windows/skilldialog.cpp:810
#, c-format
msgid "Add text to skill %s"
msgstr ""
#. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:813
msgid "Text: "
msgstr ""
@@ -9402,7 +9434,7 @@ msgstr ""
#. TRANSLATORS: unknown item message
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1176
-#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:264
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
msgid "Unknown item"
msgstr "未知物品"
@@ -9683,205 +9715,205 @@ msgstr ""
#. TRANSLATORS: item info name
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:428 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
+#: src/resources/db/itemdb.cpp:445 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "未知怪兽"
#. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "Min attack %s"
msgstr ""
#. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Max attack %s"
msgstr ""
#. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
#, c-format
msgid "Critical attack %s"
msgstr ""
#. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
#, c-format
msgid "M. Attack %s"
msgstr ""
#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
#, c-format
msgid "Min defense %s"
msgstr ""
#. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
#, c-format
msgid "Max defense %s"
msgstr ""
#. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
#, c-format
msgid "Critical defense %s"
msgstr ""
#. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
#, c-format
msgid "M. Defense %s"
msgstr ""
#. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
#, c-format
msgid "Min M. Defense %s"
msgstr ""
#. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
#, c-format
msgid "Max M. Defense %s"
msgstr ""
#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
#, c-format
msgid "Max HP %s"
msgstr ""
#. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
#, c-format
msgid "Max MP %s"
msgstr ""
#. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
#, c-format
msgid "Speed %s"
msgstr ""
#. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
#, c-format
msgid "Attack speed %s"
msgstr ""
#. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
#, c-format
msgid "Range %s"
msgstr ""
#. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
#, c-format
msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:143 src/resources/db/itemdb.cpp:149
+#: src/resources/db/itemdb.cpp:144 src/resources/db/itemdb.cpp:150
#, c-format
msgid "Min flee %s"
msgstr ""
#. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:145 src/resources/db/itemdb.cpp:151
+#: src/resources/db/itemdb.cpp:146 src/resources/db/itemdb.cpp:152
#, c-format
msgid "Max flee %s"
msgstr ""
#. TRANSLATORS: item info label (accuracy)
-#: src/resources/db/itemdb.cpp:147
+#: src/resources/db/itemdb.cpp:148
#, c-format
msgid "Perc. accuracy %s"
msgstr ""
#. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:153
+#: src/resources/db/itemdb.cpp:154
#, c-format
msgid "Card slots %s"
msgstr ""
#. TRANSLATORS: item info label (experience)
-#: src/resources/db/itemdb.cpp:155
+#: src/resources/db/itemdb.cpp:156
#, c-format
msgid "Experience %s"
msgstr ""
#. TRANSLATORS: item info label (karma)
-#: src/resources/db/itemdb.cpp:157
+#: src/resources/db/itemdb.cpp:158
#, c-format
msgid "Karma %s"
msgstr ""
#. TRANSLATORS: item info label (manner)
-#: src/resources/db/itemdb.cpp:159
+#: src/resources/db/itemdb.cpp:160
#, c-format
msgid "Manner %s"
msgstr ""
#. TRANSLATORS: item info label (money)
-#: src/resources/db/itemdb.cpp:161
+#: src/resources/db/itemdb.cpp:162
#, c-format
msgid "Money %s"
msgstr ""
#. TRANSLATORS: item info label (max weight)
-#: src/resources/db/itemdb.cpp:163
+#: src/resources/db/itemdb.cpp:164
#, c-format
msgid "Max weight %s"
msgstr ""
#. TRANSLATORS: item info label (job experience)
-#: src/resources/db/itemdb.cpp:165
+#: src/resources/db/itemdb.cpp:166
#, c-format
msgid "Job exp. %s"
msgstr ""
#. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:103
msgid "pet"
msgstr ""
#. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
msgid "skill"
msgstr ""
@@ -9891,7 +9923,7 @@ msgid "Npc"
msgstr ""
#. TRANSLATORS: memory usage chat message
-#: src/resources/memorymanager.cpp:92
+#: src/resources/memorymanager.cpp:93
#, c-format
msgid "Calculated memory usage: %d"
msgstr ""