Update translations.

1 files changed, 283 insertions, 243 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9a00d095e..cc1826c1c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"POT-Creation-Date: 2015-12-05 15:46+0300\n"
 "PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -132,7 +132,7 @@ msgstr "公会名称缺失."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
-#: src/actions/chat.cpp:513 src/actions/commands.cpp:84
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:85
 msgid "Please specify a name."
 msgstr "请指定一个名称."
 
@@ -160,91 +160,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:127
+#: src/actions/commands.cpp:128
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:140
+#: src/actions/commands.cpp:141
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:142
+#: src/actions/commands.cpp:143
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能为 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:178
 msgid "Player wasn't ignored!"
 msgstr "玩家没有被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:186
+#: src/actions/commands.cpp:187
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:188
+#: src/actions/commands.cpp:189
 msgid "Player could not be unignored!"
 msgstr "不能取消对玩家的忽视!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:203
+#: src/actions/commands.cpp:204
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:217
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:218
+#: src/actions/commands.cpp:219
 msgid "Player could not be erased!"
 msgstr "无法删除玩家!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:225
+#: src/actions/commands.cpp:226
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:232
+#: src/actions/commands.cpp:233
 msgid "disregarded"
 msgstr "无视"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:239
+#: src/actions/commands.cpp:240
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:246
+#: src/actions/commands.cpp:247
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:253
+#: src/actions/commands.cpp:254
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:532
+#: src/actions/commands.cpp:533
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1033
+#: src/actions/commands.cpp:1034
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1046
+#: src/actions/commands.cpp:1047
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -274,25 +274,25 @@ msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:474
+#: src/being/being.cpp:479
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:651
+#: src/being/being.cpp:656
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:651
+#: src/being/being.cpp:656
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2223 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr "I"
 
@@ -413,8 +413,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
-#: src/gui/popups/popupmenu.cpp:2367
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2396
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -497,8 +497,8 @@ msgstr "帮助"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
 #: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:676 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:994 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -727,24 +727,24 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
-#: src/dirs.cpp:587 src/dirs.cpp:595
+#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
+#: src/dirs.cpp:582 src/dirs.cpp:590
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:468
+#: src/dirs.cpp:463
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:510 src/dirs.cpp:517
+#: src/dirs.cpp:505 src/dirs.cpp:512
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误!"
 
-#: src/dirs.cpp:539 src/dirs.cpp:557
+#: src/dirs.cpp:534 src/dirs.cpp:552
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出."
@@ -1199,7 +1199,7 @@ msgstr "讯息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2682
 msgid "Revive"
 msgstr ""
 
@@ -1382,8 +1382,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2026
+#: src/gui/popups/popupmenu.cpp:2104 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1708,20 +1708,21 @@ msgstr "建立"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
-#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
-#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
-#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
-#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
-#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
-#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
-#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
-#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:389
+#: src/gui/popups/popupmenu.cpp:457 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:640
+#: src/gui/popups/popupmenu.cpp:681 src/gui/popups/popupmenu.cpp:706
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:947 src/gui/popups/popupmenu.cpp:980
+#: src/gui/popups/popupmenu.cpp:1764 src/gui/popups/popupmenu.cpp:1801
+#: src/gui/popups/popupmenu.cpp:1852 src/gui/popups/popupmenu.cpp:1894
+#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2117
+#: src/gui/popups/popupmenu.cpp:2144 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2186 src/gui/popups/popupmenu.cpp:2212
+#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
@@ -1756,7 +1757,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:826
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr "交易"
@@ -1770,8 +1771,8 @@ msgstr "交易"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
-#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
+#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:829 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1779,41 +1780,41 @@ msgstr "攻击"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
-#: src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:478
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:833
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:195 src/gui/popups/popupmenu.cpp:211
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:861
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:202 src/gui/popups/popupmenu.cpp:218
+#: src/gui/popups/popupmenu.cpp:534 src/gui/popups/popupmenu.cpp:868
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:881
+#: src/gui/popups/popupmenu.cpp:231 src/gui/popups/popupmenu.cpp:546
+#: src/gui/popups/popupmenu.cpp:882
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:237
+#: src/gui/popups/popupmenu.cpp:238
 msgid "Nuke"
 msgstr ""
 
@@ -1830,9 +1831,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:241 src/gui/popups/popupmenu.cpp:274
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:840 src/gui/popups/popupmenu.cpp:905
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "移动"
@@ -1840,7 +1841,7 @@ msgstr "移动"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:255 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "说话"
@@ -1854,7 +1855,7 @@ msgstr "说话"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:265 src/gui/popups/popupmenu.cpp:2426
 #: 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:168
@@ -1871,7 +1872,7 @@ msgstr "购买"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2438
 #: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
 #: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
@@ -1883,26 +1884,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:2507
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:2536
 msgid "Add comment"
 msgstr "发表评论"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:300
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:306
+#: src/gui/popups/popupmenu.cpp:307
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
@@ -1910,19 +1911,19 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:315 src/gui/popups/popupmenu.cpp:2556
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
+#: src/gui/popups/popupmenu.cpp:325 src/gui/popups/popupmenu.cpp:336
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:328
+#: src/gui/popups/popupmenu.cpp:329
 msgid "Fire"
 msgstr ""
 
@@ -1930,19 +1931,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
+#: src/gui/popups/popupmenu.cpp:339 src/gui/popups/popupmenu.cpp:352
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:355
 msgid "Drop loot"
 msgstr ""
 
@@ -1950,7 +1951,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:358 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 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
@@ -1966,14 +1967,14 @@ msgstr "卸下装备"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:625
 #: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr "重命名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:366
 msgid "Return to egg"
 msgstr ""
 
@@ -1981,38 +1982,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
+#: src/gui/popups/popupmenu.cpp:384 src/gui/popups/popupmenu.cpp:554
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:434 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:499 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2474
+#: src/gui/popups/popupmenu.cpp:500 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2503
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:596
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:601 src/gui/popups/popupmenu.cpp:1760
+#: src/gui/popups/popupmenu.cpp:1838 src/gui/popups/popupmenu.cpp:1880
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:622 src/gui/popups/popupmenu.cpp:658
 msgid "Map Item"
 msgstr "地图项"
 
@@ -2022,20 +2023,22 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
-#: src/gui/popups/popupmenu.cpp:2112
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2113
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
+#. TRANSLATORS: warp select button
+#: src/gui/popups/popupmenu.cpp:635 src/gui/popups/popupmenu.cpp:664
+#: src/net/eathena/skillrecv.cpp:336
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Move camera"
 msgstr ""
 
@@ -2044,7 +2047,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2052,69 +2055,69 @@ msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:698
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:724 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:726
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
+#: src/gui/popups/popupmenu.cpp:758 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:764
+#: src/gui/popups/popupmenu.cpp:765
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:802 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "留下"
 
@@ -2124,70 +2127,70 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
-#: src/gui/popups/popupmenu.cpp:2225
+#: src/gui/popups/popupmenu.cpp:807 src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2226
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:928
+#: src/gui/popups/popupmenu.cpp:929
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:973
+#: src/gui/popups/popupmenu.cpp:974
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1002
+#: src/gui/popups/popupmenu.cpp:1003
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1008
+#: src/gui/popups/popupmenu.cpp:1009
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1057
+#: src/gui/popups/popupmenu.cpp:1058
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1059
+#: src/gui/popups/popupmenu.cpp:1060
 msgid "Name:                    "
 msgstr "名称：                   "
 
-#: src/gui/popups/popupmenu.cpp:1077
+#: src/gui/popups/popupmenu.cpp:1078
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1079
+#: src/gui/popups/popupmenu.cpp:1080
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1652
+#: src/gui/popups/popupmenu.cpp:1653
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1665
+#: src/gui/popups/popupmenu.cpp:1666
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1669
+#: src/gui/popups/popupmenu.cpp:1670
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade all"
 msgstr ""
 
@@ -2196,50 +2199,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1682 src/gui/popups/popupmenu.cpp:1834
+#: src/gui/popups/popupmenu.cpp:1875 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/popups/popupmenu.cpp:1689
+#: src/gui/popups/popupmenu.cpp:1690
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popups/popupmenu.cpp:1694
+#: src/gui/popups/popupmenu.cpp:1695
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popups/popupmenu.cpp:1698
+#: src/gui/popups/popupmenu.cpp:1699
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1713 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/popups/popupmenu.cpp:1720
+#: src/gui/popups/popupmenu.cpp:1721
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popups/popupmenu.cpp:1725
+#: src/gui/popups/popupmenu.cpp:1726
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popups/popupmenu.cpp:1729
+#: src/gui/popups/popupmenu.cpp:1730
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -2249,56 +2252,56 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:1795 src/gui/popups/popupmenu.cpp:2625
 #: src/gui/windows/inventorywindow.cpp:201
 #: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
-#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
-#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:334
+#: src/gui/windows/skilldialog.cpp:508 src/gui/windows/skilldialog.cpp:593
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1889
+#: src/gui/popups/popupmenu.cpp:1890
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1921 src/gui/popups/popupmenu.cpp:1982
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
+#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1995
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1997
+#: src/gui/popups/popupmenu.cpp:1998
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
+#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2061
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
+#: src/gui/popups/popupmenu.cpp:2048 src/gui/popups/popupmenu.cpp:2067
 msgid "Move down"
 msgstr ""
 
@@ -2306,155 +2309,173 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2140 src/gui/popups/popupmenu.cpp:2533
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2158
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2160
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2179
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. 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:358 src/gui/windows/statuswindow.cpp:66
+#: src/gui/windows/statuswindow.cpp:241 src/gui/windows/statuswindow.cpp:363
+#, c-format
+msgid "Level: %d"
+msgstr "等级：%d"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level
+#: src/gui/popups/popupmenu.cpp:2254
+#, fuzzy
+msgid "Max level"
+msgstr "魔法等级:"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2393
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
-#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2339
+#: src/gui/popups/popupmenu.cpp:2378 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2381
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2342
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
-#: src/gui/popups/popupmenu.cpp:2355
+#: 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
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2293
+#: src/gui/popups/popupmenu.cpp:2322
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
-#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2361
+#: 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
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:2409
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2384
+#: src/gui/popups/popupmenu.cpp:2413
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2456
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2459
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2497
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2521
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2501
+#: src/gui/popups/popupmenu.cpp:2530
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2547
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2640 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Drop all"
 msgstr "所有"
 
@@ -2462,64 +2483,74 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2649 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2660
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2673
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2676
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703 src/gui/popups/popupmenu.cpp:2707
+#: src/gui/popups/popupmenu.cpp:2711
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2716 src/gui/popups/popupmenu.cpp:2720
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2728
+#: src/gui/popups/popupmenu.cpp:2732
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#: src/gui/popups/skillpopup.cpp:118
+#, fuzzy, c-format
+msgid "Level: %d / %d"
+msgstr "级别:%d (GM %d)"
+
+#: src/gui/popups/skillpopup.cpp:134
+#, fuzzy
+msgid "Level: Unknown"
+msgstr "未知."
+
 #. TRANSLATORS: input tab sub tab name
 #: src/gui/setupinputpages.cpp:43
 msgid "Basic"
@@ -2880,11 +2911,12 @@ msgstr "添加"
 #. TRANSLATORS: quit dialog name
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
+#. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "退出"
 
@@ -2940,59 +2972,65 @@ msgstr "编辑"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:504
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
 
+#. TRANSLATORS: skill level
+#: src/gui/widgets/skillinfo.cpp:108
+#, fuzzy, c-format
+msgid "Lvl: %d / %d"
+msgstr "级别:%d (GM %d)"
+
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:104
+#: src/gui/widgets/skillinfo.cpp:115
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:120 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:130
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:135
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:140
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:145
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:139
+#: src/gui/widgets/skillinfo.cpp:150
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:143
+#: src/gui/widgets/skillinfo.cpp:154
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:149
+#: src/gui/widgets/skillinfo.cpp:160
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:155
+#: src/gui/widgets/skillinfo.cpp:166
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -6442,14 +6480,6 @@ msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:358 src/gui/windows/statuswindow.cpp:66
-#: src/gui/windows/statuswindow.cpp:241 src/gui/windows/statuswindow.cpp:363
-#, c-format
-msgid "Level: %d"
-msgstr "等级：%d"
-
-#. TRANSLATORS: status bar label
 #: src/gui/windows/ministatuswindow.cpp:374
 #: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
@@ -6482,12 +6512,12 @@ msgid "Reset"
 msgstr "重置"
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:72
+#: src/gui/windows/npcselldialog.cpp:73
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:74
+#: src/gui/windows/npcselldialog.cpp:75
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6697,36 +6727,36 @@ msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:203
+#: src/gui/windows/skilldialog.cpp:204
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:301
+#: src/gui/windows/skilldialog.cpp:302
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:323
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
-#: src/gui/windows/skilldialog.cpp:508
+#: src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:767
+#: src/gui/windows/skilldialog.cpp:802
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:770
+#: src/gui/windows/skilldialog.cpp:805
 msgid "Text: "
 msgstr ""
 
@@ -8808,91 +8838,101 @@ msgstr "新密码太短."
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:216
+#: src/net/eathena/skillrecv.cpp:220
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:224
+#: src/net/eathena/skillrecv.cpp:228
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:260 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:273
+#: src/net/eathena/skillrecv.cpp:277
 msgid "Fail summon."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:282
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:281
+msgid "Need spirits."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:290
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:287
+#: src/net/eathena/skillrecv.cpp:295
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:300
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:305
+#: src/net/eathena/skillrecv.cpp:313
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
+#. TRANSLATORS: warp select window name
+#: src/net/eathena/skillrecv.cpp:334
+msgid "Select warp target"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -10090,56 +10130,56 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:891
+#: src/utils/stringutils.cpp:911
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/utils/stringutils.cpp:891
+#: src/utils/stringutils.cpp:911
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:902
+#: src/utils/stringutils.cpp:922
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/utils/stringutils.cpp:902
+#: src/utils/stringutils.cpp:922
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:912
+#: src/utils/stringutils.cpp:932
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/utils/stringutils.cpp:912
+#: src/utils/stringutils.cpp:932
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:922
+#: src/utils/stringutils.cpp:942
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/utils/stringutils.cpp:922
+#: src/utils/stringutils.cpp:942
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:932 src/utils/stringutils.cpp:937
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/utils/stringutils.cpp:932 src/utils/stringutils.cpp:937
+#: src/utils/stringutils.cpp:952 src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d seconds"
 msgstr ""