Update translations.

1 files changed, 482 insertions, 358 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d6fd10f5d..6396e3e8e 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-02-27 15:03+0300\n"
-"PO-Revision-Date: 2016-02-11 09:31+0000\n"
+"POT-Creation-Date: 2016-03-10 14:48+0300\n"
+"PO-Revision-Date: 2016-02-28 09:34+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -152,7 +152,7 @@ msgstr "公会名称缺失."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "请指定一个名称."
 
@@ -182,91 +182,96 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:142
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:155
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:157
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能为 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:192
 msgid "Player wasn't ignored!"
 msgstr "玩家没有被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:201
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:203
 msgid "Player could not be unignored!"
 msgstr "不能取消对玩家的忽视!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:218
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:231
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:233
 msgid "Player could not be erased!"
 msgstr "无法删除玩家!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:240
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:247
 msgid "disregarded"
 msgstr "无视"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:254
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:261
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:268
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:536
+#: src/actions/commands.cpp:546
 msgid "Quick message"
 msgstr ""
 
+#. TRANSLATORS: dialog header
+#: src/actions/commands.cpp:885
+msgid "Rename your homun"
+msgstr ""
+
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1050
+#: src/actions/commands.cpp:1070
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1063
+#: src/actions/commands.cpp:1083
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -293,88 +298,88 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1487
+#: src/actormanager.cpp:1505
 msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:487
+#: src/being/being.cpp:484
 msgid "Human"
 msgstr ""
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:665
+#: src/being/being.cpp:662
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:665
+#: src/being/being.cpp:662
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2243 src/gui/windows/whoisonline.cpp:881
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:881
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:886
+#: src/being/being.cpp:2258 src/gui/windows/whoisonline.cpp:886
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:384
+#: src/being/localplayer.cpp:387
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:866
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:870
 msgid "Item is too heavy."
 msgstr "项目是太重了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:874
 msgid "Item is too far away."
 msgstr "物品太远了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:878
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:882
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:886
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:890
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:889
+#: src/being/localplayer.cpp:894
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:896
+#: src/being/localplayer.cpp:901
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:920
+#: src/being/localplayer.cpp:925
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -382,53 +387,53 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1100
+#: src/being/localplayer.cpp:1126
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
-#: src/being/localplayer.cpp:1110
+#: src/being/localplayer.cpp:1104 src/being/localplayer.cpp:1110
+#: src/being/localplayer.cpp:1116
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1135
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1138
+#: src/being/localplayer.cpp:1144
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2251
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2260
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2236
+#: src/being/localplayer.cpp:2245
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2242 src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:2251 src/being/localplayer.cpp:2265
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2606
+#: src/being/localplayer.cpp:2610
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -438,8 +443,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:2354
-#: src/gui/popups/popupmenu.cpp:2396
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2470
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -523,13 +528,13 @@ msgstr "帮助"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:853 src/client.cpp:1424 src/client.cpp:1443
 #: src/dyetool/client.cpp:498 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:695 src/gui/popups/popupmenu.cpp:772
-#: src/gui/popups/popupmenu.cpp:1021 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:807
+#: src/gui/popups/popupmenu.cpp:1061 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
 
@@ -801,7 +806,7 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2202
 msgid "General"
 msgstr "常规"
 
@@ -1238,7 +1243,7 @@ msgstr "讯息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2805
 msgid "Revive"
 msgstr ""
 
@@ -1422,8 +1427,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2020
-#: src/gui/popups/popupmenu.cpp:2099 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1665,61 +1670,61 @@ msgid "Skip"
 msgstr "跳过"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176 src/gui/popups/beingpopup.cpp:197
+#: src/gui/popups/beingpopup.cpp:176 src/gui/popups/beingpopup.cpp:208
 #, c-format
 msgid "Hungry: %d"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:180 src/gui/popups/beingpopup.cpp:201
+#: src/gui/popups/beingpopup.cpp:180 src/gui/popups/beingpopup.cpp:212
 #, c-format
 msgid "Intimacy: %d"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:218
+#: src/gui/popups/beingpopup.cpp:240
 #, c-format
 msgid "Party: %s"
 msgstr "团队:%s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:237
+#: src/gui/popups/beingpopup.cpp:259
 #, c-format
 msgid "Guild: %s"
 msgstr "工会:%s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:255
+#: src/gui/popups/beingpopup.cpp:277
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:273
+#: src/gui/popups/beingpopup.cpp:295
 #, c-format
 msgid "Buy shop: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:291
+#: src/gui/popups/beingpopup.cpp:313
 #, c-format
 msgid "Sell shop: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:307
+#: src/gui/popups/beingpopup.cpp:329
 #, c-format
 msgid "Comment: %s"
 msgstr "评论: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:335
+#: src/gui/popups/beingpopup.cpp:357
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:350
+#: src/gui/popups/beingpopup.cpp:372
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1748,22 +1753,22 @@ msgstr "建立"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:401
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:700 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:750 src/gui/popups/popupmenu.cpp:943
-#: src/gui/popups/popupmenu.cpp:970 src/gui/popups/popupmenu.cpp:1007
-#: src/gui/popups/popupmenu.cpp:1743 src/gui/popups/popupmenu.cpp:1783
-#: src/gui/popups/popupmenu.cpp:1840 src/gui/popups/popupmenu.cpp:1887
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1998
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2112
-#: src/gui/popups/popupmenu.cpp:2142 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2210
-#: src/gui/popups/popupmenu.cpp:2228 src/gui/popups/popupmenu.cpp:2258
-#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2704
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/popups/popupmenu.cpp:2999
-#: src/gui/popups/popupmenu.cpp:3020 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:433
+#: src/gui/popups/popupmenu.cpp:501 src/gui/popups/popupmenu.cpp:605
+#: src/gui/popups/popupmenu.cpp:659 src/gui/popups/popupmenu.cpp:694
+#: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:785 src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:1009 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1806 src/gui/popups/popupmenu.cpp:1846
+#: src/gui/popups/popupmenu.cpp:1904 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1994 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2236
+#: src/gui/popups/popupmenu.cpp:2258 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2650 src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3122
+#: src/gui/popups/popupmenu.cpp:3155 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1798,7 +1803,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:847
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:883
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:343
 msgid "Trade"
@@ -1813,8 +1818,8 @@ msgstr "交易"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:295
-#: src/gui/popups/popupmenu.cpp:850 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:301
+#: src/gui/popups/popupmenu.cpp:886 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1826,36 +1831,36 @@ msgstr "攻击"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:491
+#: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:524
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:854
-#: src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:187 src/gui/popups/popupmenu.cpp:891
+#: src/gui/popups/popupmenu.cpp:2870
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:882
+#: src/gui/popups/popupmenu.cpp:207 src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:919
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:547 src/gui/popups/popupmenu.cpp:889
+#: src/gui/popups/popupmenu.cpp:214 src/gui/popups/popupmenu.cpp:230
+#: src/gui/popups/popupmenu.cpp:581 src/gui/popups/popupmenu.cpp:926
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:559
-#: src/gui/popups/popupmenu.cpp:903
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:940
 msgid "Invite to guild"
 msgstr ""
 
@@ -1863,7 +1868,7 @@ msgstr ""
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2841
 msgid "Nuke"
 msgstr ""
 
@@ -1880,9 +1885,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/popups/popupmenu.cpp:281
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:687
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:928
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:555 src/gui/popups/popupmenu.cpp:722
+#: src/gui/popups/popupmenu.cpp:898 src/gui/popups/popupmenu.cpp:967
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "移动"
@@ -1891,7 +1896,7 @@ msgstr "移动"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:261 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "说话"
@@ -1906,7 +1911,7 @@ msgstr "说话"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2500
 #: 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
@@ -1924,7 +1929,7 @@ msgstr "购买"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:274 src/gui/popups/popupmenu.cpp:2438
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2512
 #: 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
@@ -1936,26 +1941,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:284 src/gui/popups/popupmenu.cpp:501
-#: src/gui/popups/popupmenu.cpp:2536
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Add comment"
 msgstr "发表评论"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:316
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:320
+#: src/gui/popups/popupmenu.cpp:327
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
@@ -1963,19 +1968,19 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:331 src/gui/popups/popupmenu.cpp:2632
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:334 src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:358
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:346
 msgid "Fire"
 msgstr ""
 
@@ -1983,21 +1988,33 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:349 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:380
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet rename item
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: rename map item
+#. TRANSLATORS: character rename button
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:679 src/gui/windows/charselectdialog.cpp:107
+#: src/gui/windows/shopwindow.cpp:194
+msgid "Rename"
+msgstr "重命名"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:354 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:369 src/gui/popups/popupmenu.cpp:2844
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:366
+#: src/gui/popups/popupmenu.cpp:383
 msgid "Drop loot"
 msgstr ""
 
@@ -2005,7 +2022,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:369 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:386 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -2017,19 +2034,8 @@ msgid "Unequip"
 msgstr "卸下装备"
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: pet rename item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: rename map item
-#. TRANSLATORS: character rename button
-#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:374 src/gui/popups/popupmenu.cpp:644
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
-msgid "Rename"
-msgstr "重命名"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:378
+#: src/gui/popups/popupmenu.cpp:405 src/resources/db/petdb.cpp:156
 msgid "Return to egg"
 msgstr ""
 
@@ -2037,38 +2043,39 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:428 src/gui/popups/popupmenu.cpp:601
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:446 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:478 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:513 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2503
+#: src/gui/popups/popupmenu.cpp:547 src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:648
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:618 src/gui/popups/popupmenu.cpp:1739
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1872
+#: src/gui/popups/popupmenu.cpp:653 src/gui/popups/popupmenu.cpp:1802
+#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:2210
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:676 src/gui/popups/popupmenu.cpp:712
 msgid "Map Item"
 msgstr "地图项"
 
@@ -2078,22 +2085,22 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:647 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2108
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:689 src/gui/popups/popupmenu.cpp:718
 #: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:725
 msgid "Move camera"
 msgstr ""
 
@@ -2102,7 +2109,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:714 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:749 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2110,69 +2117,69 @@ msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:752
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:778 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:777 src/gui/windows/npcdialog.cpp:126
+#: src/gui/popups/popupmenu.cpp:812 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:784
+#: src/gui/popups/popupmenu.cpp:819
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:790
+#: src/gui/popups/popupmenu.cpp:825
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:796
+#: src/gui/popups/popupmenu.cpp:831
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:837
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:814
+#: src/gui/popups/popupmenu.cpp:849
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:821 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:856 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "留下"
 
@@ -2182,84 +2189,84 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:826 src/gui/popups/popupmenu.cpp:2180
-#: src/gui/popups/popupmenu.cpp:2224
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2298
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:952
+#: src/gui/popups/popupmenu.cpp:991
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1001
+#: src/gui/popups/popupmenu.cpp:1041
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1030
+#: src/gui/popups/popupmenu.cpp:1070
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1036
+#: src/gui/popups/popupmenu.cpp:1076
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1126
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1129
 msgid "Name:                    "
 msgstr "名称：                   "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1104
+#: src/gui/popups/popupmenu.cpp:1144
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1107
+#: src/gui/popups/popupmenu.cpp:1147
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1616
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1624
+#: src/gui/popups/popupmenu.cpp:1686
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1629
+#: src/gui/popups/popupmenu.cpp:1691
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1633
+#: src/gui/popups/popupmenu.cpp:1695
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1637
+#: src/gui/popups/popupmenu.cpp:1699
 msgid "Add to trade all"
 msgstr ""
 
@@ -2268,8 +2275,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1645 src/gui/popups/popupmenu.cpp:1821
-#: src/gui/popups/popupmenu.cpp:1867 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1707 src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1932 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:910 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2277,63 +2284,63 @@ msgstr "存储"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1653
+#: src/gui/popups/popupmenu.cpp:1715
 msgid "Store 10"
 msgstr "商店10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1658
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Store half"
 msgstr "商店的一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1662
+#: src/gui/popups/popupmenu.cpp:1724
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1666
+#: src/gui/popups/popupmenu.cpp:1728
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1690 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1752 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:1698
+#: src/gui/popups/popupmenu.cpp:1760
 msgid "Retrieve 10"
 msgstr "拿出10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1765
 msgid "Retrieve half"
 msgstr "拿出一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1707
+#: src/gui/popups/popupmenu.cpp:1769
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1773
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -2344,7 +2351,7 @@ msgstr "检索所有"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:1839 src/gui/popups/popupmenu.cpp:2704
 #: src/gui/windows/inventorywindow.cpp:206
 #: src/gui/windows/inventorywindow.cpp:797 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
@@ -2354,49 +2361,52 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide player
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/popups/popupmenu.cpp:1975
-#: src/gui/popups/popupmenu.cpp:2757 src/gui/popups/popupmenu.cpp:2777
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: hide npc
+#: src/gui/popups/popupmenu.cpp:1980 src/gui/popups/popupmenu.cpp:2042
+#: src/gui/popups/popupmenu.cpp:2862 src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2996
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1921 src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2049
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2056
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2058
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1995 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2062 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:2036 src/gui/popups/popupmenu.cpp:2055
+#: src/gui/popups/popupmenu.cpp:2105 src/gui/popups/popupmenu.cpp:2124
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2130
 msgid "Move down"
 msgstr ""
 
@@ -2404,30 +2414,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2137 src/gui/popups/popupmenu.cpp:2533
+#: src/gui/popups/popupmenu.cpp:2207 src/gui/popups/popupmenu.cpp:2607
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2156
+#: src/gui/popups/popupmenu.cpp:2229
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2232
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2177
+#: src/gui/popups/popupmenu.cpp:2251
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2195
+#: src/gui/popups/popupmenu.cpp:2269
 msgid "Show window"
 msgstr ""
 
@@ -2435,144 +2445,144 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:67
-#: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:366
+#: src/gui/popups/popupmenu.cpp:2323 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
 msgid "Level: %d"
 msgstr "等级：%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2328
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2336
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2393
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2410
+#: src/gui/popups/popupmenu.cpp:2449 src/gui/popups/popupmenu.cpp:2467
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
-#: src/gui/popups/popupmenu.cpp:2378 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2452 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2381
+#: src/gui/popups/popupmenu.cpp:2380 src/gui/popups/popupmenu.cpp:2455
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2342
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/popups/popupmenu.cpp:2416
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2312 src/gui/popups/popupmenu.cpp:2345
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2366
-#: src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2419
+#: src/gui/popups/popupmenu.cpp:2431 src/gui/popups/popupmenu.cpp:2440
+#: src/gui/popups/popupmenu.cpp:2458
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2396
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2333 src/gui/popups/popupmenu.cpp:2351
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:2407 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2446
+#: src/gui/popups/popupmenu.cpp:2464
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2409
+#: src/gui/popups/popupmenu.cpp:2483
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2487
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2530
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2518 src/gui/popups/popupmenu.cpp:2533
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2571
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2595
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2604
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2689
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2719 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2722
 msgid "Drop all"
 msgstr "所有"
 
@@ -2580,50 +2590,47 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2654 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2728 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:923
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2673
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2747
+#, c-format
 msgid "Show %s"
-msgstr "显示"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2677
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:2751
 msgid "Account info"
-msgstr "帐号：%s"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2680
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:2754
 msgid "Level"
-msgstr "等级：%d"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2683
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:2757
 msgid "Stats"
-msgstr "状态"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player inventory list
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2760 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:311
 msgid "Inventory"
@@ -2632,7 +2639,7 @@ msgstr "物品栏"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2689 src/resources/inventory/inventory.cpp:316
+#: src/gui/popups/popupmenu.cpp:2763 src/resources/inventory/inventory.cpp:316
 msgid "Storage"
 msgstr "仓库"
 
@@ -2641,7 +2648,7 @@ msgstr "仓库"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2692 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2766 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:327
 msgid "Cart"
@@ -2650,32 +2657,31 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2769 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "命令"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2698
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:2772
 msgid "Char commands"
-msgstr "命令"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2701 src/gui/popups/popupmenu.cpp:2868
+#: src/gui/popups/popupmenu.cpp:2775 src/gui/popups/popupmenu.cpp:2977
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2715
+#: src/gui/popups/popupmenu.cpp:2789
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:2795
 msgid "Check ip"
 msgstr ""
 
@@ -2683,124 +2689,150 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2725 src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2799 src/gui/popups/popupmenu.cpp:3007
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2728
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: warp npc to player location
+#: src/gui/popups/popupmenu.cpp:2802 src/gui/popups/popupmenu.cpp:3001
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: recall all party members to player location
+#: src/gui/popups/popupmenu.cpp:2817
+msgid "Recall party"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: recall all guild members to player location
+#: src/gui/popups/popupmenu.cpp:2824
+msgid "Recall guild"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: give party leader status
+#: src/gui/popups/popupmenu.cpp:2835
+msgid "Give party leader"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2745
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:2850
 msgid "Show..."
-msgstr "显示"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2853
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:2873
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2771
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2774
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2781
+#: src/gui/popups/popupmenu.cpp:2886
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2889
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2787
+#: src/gui/popups/popupmenu.cpp:2892
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2790
+#: src/gui/popups/popupmenu.cpp:2895
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2905
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2803
+#: src/gui/popups/popupmenu.cpp:2908
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: break guild
+#: src/gui/popups/popupmenu.cpp:2912
+#, fuzzy
+msgid "Break guild"
+msgstr "离开公会?"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:2810 src/gui/popups/popupmenu.cpp:2881
-#: src/gui/popups/popupmenu.cpp:2903
+#: src/gui/popups/popupmenu.cpp:2919 src/gui/popups/popupmenu.cpp:2990
+#: src/gui/popups/popupmenu.cpp:3019
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2927
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2826 src/gui/popups/popupmenu.cpp:2830
-#: src/gui/popups/popupmenu.cpp:2834 src/gui/popups/popupmenu.cpp:2838
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2935 src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:2943 src/gui/popups/popupmenu.cpp:2947
+#: src/gui/popups/popupmenu.cpp:2951
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2847 src/gui/popups/popupmenu.cpp:2851
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/popups/popupmenu.cpp:2859
-#: src/gui/popups/popupmenu.cpp:2863
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2809,19 +2841,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:2915
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3031
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:2912
+#: src/gui/popups/popupmenu.cpp:3028
 msgid "Spawn slave"
 msgstr ""
 
@@ -2833,8 +2865,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:2919 src/gui/popups/popupmenu.cpp:2938
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/charselectdialog.cpp:76
+#: src/gui/popups/popupmenu.cpp:3035 src/gui/popups/popupmenu.cpp:3054
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/windows/charselectdialog.cpp:76
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 msgid "Info"
@@ -2842,34 +2874,46 @@ msgstr "信息"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:2922
+#: src/gui/popups/popupmenu.cpp:3038
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:2926
+#: src/gui/popups/popupmenu.cpp:3042
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:2941 src/gui/popups/popupmenu.cpp:2954
+#: src/gui/popups/popupmenu.cpp:3057 src/gui/popups/popupmenu.cpp:3070
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2961
+#: src/gui/popups/popupmenu.cpp:3077
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3015
+#: src/gui/popups/popupmenu.cpp:3150
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: open mail dialog
+#: src/gui/popups/popupmenu.cpp:3169
+msgid "Mail to..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: catch pet command
+#: src/gui/popups/popupmenu.cpp:3180
+msgid "Taming pet"
+msgstr ""
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -3219,8 +3263,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:333
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
@@ -3244,7 +3288,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
 msgstr "添加"
 
@@ -3271,7 +3315,7 @@ msgstr "退出"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
 #: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/statuswindow.cpp:745
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -3292,8 +3336,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:482 src/gui/windows/statuswindow.cpp:538
-#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
 msgid "Max"
 msgstr "最大"
 
@@ -3402,13 +3446,13 @@ msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:532
+#: src/gui/widgets/tabs/chat/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:538
+#: src/gui/widgets/tabs/chat/chattab.cpp:547
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4431,7 +4475,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/windows/questswindow.cpp:204
 msgid "unknown"
 msgstr ""
 
@@ -5838,7 +5882,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:65
 msgid "Quests"
 msgstr ""
 
@@ -6336,35 +6380,35 @@ msgid "Enter password:"
 msgstr "输入密码:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:672
+#: src/gui/windows/chatwindow.cpp:677
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1122
+#: src/gui/windows/chatwindow.cpp:1127
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
 
 #. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1554
+#: src/gui/windows/chatwindow.cpp:1559
 msgid "Moved: "
 msgstr ""
 
 #. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1562
+#: src/gui/windows/chatwindow.cpp:1567
 msgid "Your message was moved to trade tab"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1587
+#: src/gui/windows/chatwindow.cpp:1592
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1756 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1761 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6878,7 +6922,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:235
+#: src/gui/windows/statuswindow.cpp:236
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
@@ -6942,6 +6986,26 @@ msgstr "先卸掉装备"
 msgid "Away outfit"
 msgstr ""
 
+#. TRANSLATORS: quest reward
+#: src/gui/windows/questswindow.cpp:474
+msgid "Reward:"
+msgstr ""
+
+#. TRANSLATORS: quest giver name
+#: src/gui/windows/questswindow.cpp:481
+msgid "Quest Giver:"
+msgstr ""
+
+#. TRANSLATORS: quest npc name
+#: src/gui/windows/questswindow.cpp:488
+msgid "Npc:"
+msgstr ""
+
+#. TRANSLATORS: quest coordinates
+#: src/gui/windows/questswindow.cpp:496
+msgid "Coordinates:"
+msgstr ""
+
 #. TRANSLATORS: quit dialog button
 #: src/gui/windows/quitdialog.cpp:61
 msgid "Switch server"
@@ -7310,33 +7374,33 @@ msgid "Choose your party's name."
 msgstr "选择n的名称."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:72
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:75
 msgid "Exp:"
 msgstr "经验:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:135
+#: src/gui/windows/statuswindow.cpp:136
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:172 src/gui/windows/statuswindow.cpp:293
+#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:174
+#: src/gui/windows/statuswindow.cpp:175
 msgid "Job:"
 msgstr "职业:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Character points: %d"
 msgstr "角色可用点: %d"
@@ -7407,56 +7471,62 @@ msgid "Save"
 msgstr "保存"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Propose trade"
 msgstr "打算交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agree trade"
 msgstr "同意交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:71
 msgid "Agreed. Waiting..."
 msgstr "已同意。等待中..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:75
 msgid "Trade: You"
 msgstr "交易：你"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:191
+#: src/gui/windows/tradewindow.cpp:83 src/gui/windows/tradewindow.cpp:192
 #, c-format
 msgid "You get %s"
 msgstr "你得到%s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:88
 msgid "Change"
 msgstr "改变"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:133
 msgid "You give:"
 msgstr "你给予:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:435
+#: src/gui/windows/tradewindow.cpp:436
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:524
+#: src/gui/windows/tradewindow.cpp:525
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品."
 
+#. TRANSLATORS: trade error
+#: src/gui/windows/tradewindow.cpp:538
+#, fuzzy
+msgid "Failed adding item. You can not trade equipped items."
+msgstr "添加物品失败。您不能交易这项物品."
+
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
 #: src/gui/windows/unregisterdialog.cpp:48
@@ -7548,25 +7618,25 @@ msgstr "选择世界"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:389 src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:395
+#: src/input/inputmanager.cpp:401
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:409
+#: src/input/inputmanager.cpp:415
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:440
+#: src/input/inputmanager.cpp:444
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7574,7 +7644,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:454 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -8909,7 +8979,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:171 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:126
+#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:121
 msgid "Unknown error."
 msgstr "未知的错误."
 
@@ -9277,7 +9347,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:642
+#: src/net/eathena/inventoryrecv.cpp:675
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9285,23 +9355,23 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/net/eathena/inventoryrecv.cpp:969 src/net/eathena/inventoryrecv.cpp:1102
+#: src/resources/db/itemdb.cpp:266
 msgid "Unknown item"
 msgstr "未知物品"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:114
+#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:109
 msgid "Account was not found. Please re-login."
 msgstr "帐号不存在。请重新登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:118
+#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:113
 msgid "Old password incorrect."
 msgstr "旧密码不正确."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:122
+#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:117
 msgid "New password too short."
 msgstr "新密码太短."
 
@@ -9431,32 +9501,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是否接受?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:147
 msgid "Strength:"
 msgstr "力量:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:156
+#: src/net/tmwa/charserverhandler.cpp:149
 msgid "Agility:"
 msgstr "敏捷:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:158
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Vitality:"
 msgstr "生命:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:160
+#: src/net/tmwa/charserverhandler.cpp:153
 msgid "Intelligence:"
 msgstr "智力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:162
+#: src/net/tmwa/charserverhandler.cpp:155
 msgid "Dexterity:"
 msgstr "灵巧:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:164
+#: src/net/tmwa/charserverhandler.cpp:157
 msgid "Luck:"
 msgstr "幸运:"
 
@@ -9558,149 +9628,203 @@ msgstr ""
 #. 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:388 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:430 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知怪兽"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:137
+#, fuzzy, c-format
+msgid "Attack speed %s"
+msgstr "攻击暴徒"
+
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:143 src/resources/db/itemdb.cpp:149
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:145 src/resources/db/itemdb.cpp:151
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (accuracy)
+#: src/resources/db/itemdb.cpp:147
+#, fuzzy, c-format
+msgid "% Accuracy %s"
+msgstr "％精度"
+
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:153
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (experience)
+#: src/resources/db/itemdb.cpp:155
+#, fuzzy, c-format
+msgid "Experience %s"
+msgstr "经验条"
+
+#. TRANSLATORS: item info label (karma)
+#: src/resources/db/itemdb.cpp:157
+#, c-format
+msgid "Karma %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (manner)
+#: src/resources/db/itemdb.cpp:159
+#, c-format
+msgid "Manner %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (money)
+#: src/resources/db/itemdb.cpp:161
+#, fuzzy, c-format
+msgid "Money %s"
+msgstr "金币: %s"
+
+#. TRANSLATORS: item info label (weight)
+#: src/resources/db/itemdb.cpp:163
+#, fuzzy, c-format
+msgid "Weight %s"
+msgstr "重量：%s"
+
+#. TRANSLATORS: item info label (max weight)
+#: src/resources/db/itemdb.cpp:165
+#, fuzzy, c-format
+msgid "Max weight %s"
+msgstr "重量：%s"
+
+#. TRANSLATORS: item info label (job experience)
+#: src/resources/db/itemdb.cpp:167
+#, c-format
+msgid "Job exp. %s"
+msgstr ""
+
 #. TRANSLATORS: unknown info name
 #: src/resources/db/petdb.cpp:100
 msgid "pet"