Update translations.

1 files changed, 465 insertions, 416 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4a57aaf9c..538d38fd8 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-07 14:36+0300\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
 "PO-Revision-Date: 2015-11-03 09:06+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -40,7 +40,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -51,13 +51,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -274,25 +274,25 @@ msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr "I"
 
@@ -303,53 +303,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr "项目是太重了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr "物品太远了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -357,53 +357,53 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -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:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -441,40 +441,40 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
@@ -484,6 +484,7 @@ msgstr "帮助"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -494,10 +495,10 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: 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/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -507,32 +508,32 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -546,13 +547,13 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -561,37 +562,37 @@ msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
@@ -774,23 +775,23 @@ msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1198,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:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1381,8 +1382,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: 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
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1548,7 +1549,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1672,13 +1673,13 @@ msgid "Comment: %s"
 msgstr "评论: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1707,27 +1708,27 @@ msgstr "建立"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1755,7 +1756,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr "交易"
@@ -1769,8 +1770,8 @@ msgstr "交易"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: 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/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1778,41 +1779,41 @@ msgstr "攻击"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1829,9 +1830,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: 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/setupinputpages.cpp:45
 msgid "Move"
 msgstr "移动"
@@ -1839,7 +1840,7 @@ msgstr "移动"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "说话"
@@ -1853,7 +1854,7 @@ msgstr "说话"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
 #: 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
@@ -1870,7 +1871,7 @@ msgstr "购买"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
 #: 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
@@ -1882,26 +1883,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr "发表评论"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
@@ -1909,19 +1910,19 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1929,19 +1930,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1949,7 +1950,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 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
@@ -1965,14 +1966,14 @@ msgstr "卸下装备"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: 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:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1980,38 +1981,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 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:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr "地图项"
 
@@ -2021,20 +2022,20 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2043,7 +2044,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2051,69 +2052,69 @@ msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:119
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "留下"
 
@@ -2123,70 +2124,70 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr "名称：                   "
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2195,50 +2196,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: 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/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -2248,56 +2249,56 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 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/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 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:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2305,155 +2306,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: 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
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: 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
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr "所有"
 
@@ -2461,60 +2462,60 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2561,12 +2562,12 @@ msgstr "聊天"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr "其他"
@@ -2577,259 +2578,265 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr "存在"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "怪物"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+#, fuzzy
+msgid "Skill unit"
+msgstr "技能为%d"
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr "粒子效果"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr "玩家惠普酒吧"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr "玩家HP指示栏(第二个颜色)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr "怪物的HPl"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr "怪物的HP指示栏(第二个颜色)"
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr "会心一击"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr "失误"
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2840,8 +2847,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
@@ -2891,7 +2898,7 @@ msgstr "退出"
 #: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr "+"
 
@@ -2900,11 +2907,9 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#. TRANSLATORS: status window label (minus sign)
 #: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
-#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2914,14 +2919,14 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr "最大"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:351
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
 #: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -2936,59 +2941,59 @@ msgstr "编辑"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4789,7 +4794,7 @@ msgstr "允许密语"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5475,7 +5480,7 @@ msgid "SKI"
 msgstr "技能"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr "技能"
 
@@ -5612,7 +5617,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:608 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立"
 
@@ -5670,7 +5675,7 @@ msgstr "更换密码"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "密码:"
@@ -5713,7 +5718,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "姓名:"
 
@@ -5724,8 +5729,8 @@ msgstr "姓名:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ">"
 
@@ -5735,8 +5740,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209 src/gui/windows/outfitwindow.cpp:61
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr "<"
 
@@ -5757,49 +5762,59 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -5815,25 +5830,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "开始"
@@ -5842,44 +5857,30 @@ msgstr "开始"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: 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"
 msgstr "信息"
 
-#. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: unregister dialog name
-#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "注销"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr "变更电子邮件"
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5889,27 +5890,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr "输入密码:"
 
@@ -6078,11 +6079,6 @@ msgstr ""
 msgid "Equip"
 msgstr "装备"
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6281,8 +6277,8 @@ msgstr "更改服务器"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr "注册"
 
@@ -6395,73 +6391,73 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr "法力栏"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr "经验条"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "重量栏"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr "钱栏"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr "状态栏"
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
-#: src/gui/windows/statuswindow.cpp:262 src/gui/windows/statuswindow.cpp:387
+#: 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:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr "需要"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
@@ -6524,40 +6520,40 @@ msgid "Switch character"
 msgstr "交换角色"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr "确认:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "帅哥"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "美女"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "电子邮件:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6565,17 +6561,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6639,7 +6646,7 @@ msgid "Reset Windows"
 msgstr "重置窗口"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr "个人商店"
 
@@ -6670,49 +6677,61 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗?"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, fuzzy, c-format
+msgid "Add text to skill %s"
+msgstr "添加到出售商店."
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+#, fuzzy
+msgid "Text: "
+msgstr "文本"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6832,43 +6851,37 @@ msgid "Choose your party's name."
 msgstr "选择n的名称."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr "经验:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr "职业:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr "角色可用点: %d"
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6985,6 +6998,13 @@ msgstr "你没有足够的钱币."
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品."
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr "注销"
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8418,11 +8438,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8795,66 +8810,91 @@ msgstr "新密码太短."
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 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:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 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:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 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
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8986,7 +9026,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9135,6 +9175,12 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+#, fuzzy
+msgid "skill"
+msgstr "技能"
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
@@ -10100,3 +10146,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Change Email"
+#~ msgstr "变更电子邮件"