update and rebuild translations.

1 files changed, 287 insertions, 287 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6b05a372a..8a838b6f1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-04-12 02:13+0300\n"
+"POT-Creation-Date: 2013-04-13 12:35+0300\n"
 "PO-Revision-Date: 2013-04-11 23:23+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -47,64 +47,64 @@ msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1669 src/gui/whoisonline.cpp:828
+#: src/being.cpp:1663 src/gui/whoisonline.cpp:828
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1674 src/gui/whoisonline.cpp:833
+#: src/being.cpp:1668 src/gui/whoisonline.cpp:833
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1116 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:155
+#: src/client.cpp:1111 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:155
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:1119 src/gui/setup_perfomance.cpp:59
+#: src/client.cpp:1114 src/gui/setup_perfomance.cpp:59
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:1121 src/gui/setup_video.cpp:243
+#: src/client.cpp:1116 src/gui/setup_video.cpp:243
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:1123
+#: src/client.cpp:1118
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1126 src/gui/didyouknowwindow.cpp:73
+#: src/client.cpp:1121 src/gui/didyouknowwindow.cpp:73
 #: src/gui/inventorywindow.cpp:208 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:86 src/gui/popupmenu.cpp:508
 #: src/gui/questswindow.cpp:129 src/gui/shopwindow.cpp:78
 msgid "Close"
 msgstr "关闭"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1208
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
-#: src/client.cpp:1255
+#: src/client.cpp:1250
 msgid "Logging in"
 msgstr "登录中"
 
-#: src/client.cpp:1293
+#: src/client.cpp:1288
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
-#: src/client.cpp:1401
+#: src/client.cpp:1396
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1439
+#: src/client.cpp:1434
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
-#: src/client.cpp:1451
+#: src/client.cpp:1446
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
-#: src/client.cpp:1507 src/client.cpp:1517 src/client.cpp:1677
-#: src/gui/changeemaildialog.cpp:160 src/gui/changepassworddialog.cpp:147
+#: src/client.cpp:1502 src/client.cpp:1512 src/client.cpp:1672
+#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:294 src/gui/charselectdialog.cpp:400
 #: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:250
 #: src/gui/unregisterdialog.cpp:138 src/net/ea/charserverhandler.cpp:174
@@ -112,50 +112,50 @@ msgstr "正在更改游戏服务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1529
+#: src/client.cpp:1524
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
-#: src/client.cpp:1565
+#: src/client.cpp:1560
 msgid "Password Change"
 msgstr "更改密码"
 
-#: src/client.cpp:1566
+#: src/client.cpp:1561
 msgid "Password changed successfully!"
 msgstr "密码更改成功！"
 
-#: src/client.cpp:1586
+#: src/client.cpp:1581
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
-#: src/client.cpp:1587
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功！"
 
-#: src/client.cpp:1607
+#: src/client.cpp:1602
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
-#: src/client.cpp:1608
+#: src/client.cpp:1603
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来... ..."
 
-#: src/client.cpp:1857 src/client.cpp:1871 src/client.cpp:1913
-#: src/client.cpp:1928 src/client.cpp:2363 src/client.cpp:2370
+#: src/client.cpp:1852 src/client.cpp:1866 src/client.cpp:1908
+#: src/client.cpp:1923 src/client.cpp:2358 src/client.cpp:2365
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出。"
 
-#: src/client.cpp:2064
+#: src/client.cpp:2059
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "主机更新无效：%s"
 
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2099 src/client.cpp:2105
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2126 src/client.cpp:2138
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出。"
@@ -164,8 +164,8 @@ msgstr "错误：%s 不存在且无法创建！正在退出。"
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commands.cpp:134 src/commands.cpp:397 src/commands.cpp:471
-#: src/commands.cpp:511
+#: src/commands.cpp:134 src/commands.cpp:398 src/commands.cpp:472
+#: src/commands.cpp:512
 msgid "Please specify a name."
 msgstr "请指定一个名称。"
 
@@ -195,138 +195,138 @@ msgid ""
 "you."
 msgstr "无法为 \"%s\"创建私信标签！要么已经存在，要么是你自己。"
 
-#: src/commands.cpp:356 src/commands.cpp:364
+#: src/commands.cpp:357 src/commands.cpp:365
 msgid "Cache cleaned"
 msgstr ""
 
-#: src/commands.cpp:373 src/net/ea/gui/partytab.cpp:127
+#: src/commands.cpp:374 src/net/ea/gui/partytab.cpp:127
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
-#: src/commands.cpp:384
+#: src/commands.cpp:385
 msgid "Guild name is missing."
 msgstr "公会名称缺失。"
 
-#: src/commands.cpp:412
+#: src/commands.cpp:413
 msgid "Return toggles chat."
 msgstr "<回车>键促发聊天。"
 
-#: src/commands.cpp:412
+#: src/commands.cpp:413
 msgid "Message closes chat."
 msgstr "讯息关闭聊天。"
 
-#: src/commands.cpp:421
+#: src/commands.cpp:422
 msgid "Return now toggles chat."
 msgstr "<回车>键现在促发聊天。"
 
-#: src/commands.cpp:427
+#: src/commands.cpp:428
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天。"
 
-#: src/commands.cpp:453
+#: src/commands.cpp:454
 msgid "friend"
 msgstr "朋友"
 
-#: src/commands.cpp:458
+#: src/commands.cpp:459
 msgid "disregarded"
 msgstr "无视"
 
-#: src/commands.cpp:463
+#: src/commands.cpp:464
 msgid "neutral"
 msgstr "中立"
 
-#: src/commands.cpp:483
+#: src/commands.cpp:484
 msgid "Player wasn't ignored!"
 msgstr "玩家没有被忽视！"
 
-#: src/commands.cpp:490
+#: src/commands.cpp:491
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽视！"
 
-#: src/commands.cpp:492
+#: src/commands.cpp:493
 msgid "Player could not be unignored!"
 msgstr "不能取消对玩家的忽视!"
 
-#: src/commands.cpp:498
+#: src/commands.cpp:499
 msgid "blacklisted"
 msgstr ""
 
-#: src/commands.cpp:503
+#: src/commands.cpp:504
 msgid "enemy"
 msgstr ""
 
-#: src/commands.cpp:518
+#: src/commands.cpp:519
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
-#: src/commands.cpp:529
+#: src/commands.cpp:530
 msgid "Player successfully erased!"
 msgstr "玩家成功被删除！"
 
-#: src/commands.cpp:531
+#: src/commands.cpp:532
 msgid "Player could not be erased!"
 msgstr "无法删除玩家！"
 
-#: src/commands.cpp:811 src/commands.cpp:859
+#: src/commands.cpp:812 src/commands.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commands.cpp:821
+#: src/commands.cpp:822
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commands.cpp:830
+#: src/commands.cpp:831
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commands.cpp:838
+#: src/commands.cpp:839
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commands.cpp:847
+#: src/commands.cpp:848
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commands.cpp:856
+#: src/commands.cpp:857
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commands.cpp:930
+#: src/commands.cpp:931
 msgid "font cache size"
 msgstr "字体缓存大小"
 
-#: src/commands.cpp:942
+#: src/commands.cpp:943
 msgid "Cache size:"
 msgstr ""
 
-#: src/commands.cpp:946
+#: src/commands.cpp:947
 msgid "Created:"
 msgstr "创建于："
 
-#: src/commands.cpp:948
+#: src/commands.cpp:949
 msgid "Deleted:"
 msgstr "删除："
 
-#: src/commands.cpp:1009
+#: src/commands.cpp:1010
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1120 src/commands.cpp:1127
+#: src/commands.cpp:1121 src/commands.cpp:1128
 msgid "Resource images:"
 msgstr ""
 
-#: src/commands.cpp:1122 src/commands.cpp:1129
+#: src/commands.cpp:1123 src/commands.cpp:1130
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -335,11 +335,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:255 src/gui/widgets/chattab.cpp:452
+#: src/game.cpp:255 src/gui/widgets/chattab.cpp:451
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:270 src/gui/debugwindow.cpp:50 src/gui/widgets/chattab.cpp:454
+#: src/game.cpp:270 src/gui/debugwindow.cpp:50 src/gui/widgets/chattab.cpp:453
 #: src/gui/windowmenu.cpp:144
 msgid "Debug"
 msgstr "调试 "
@@ -380,38 +380,38 @@ msgstr ""
 msgid "Comment: %s"
 msgstr "评论: %s"
 
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:267
 msgid "Bot Checker"
 msgstr "挂机检查"
 
-#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:87
+#: src/gui/botcheckerwindow.cpp:275 src/gui/npcdialog.cpp:87
 msgid "Reset"
 msgstr "重置"
 
-#: src/gui/botcheckerwindow.cpp:303 src/gui/setup_relations.cpp:60
+#: src/gui/botcheckerwindow.cpp:301 src/gui/setup_relations.cpp:60
 msgid "Name"
 msgstr "姓名"
 
-#: src/gui/botcheckerwindow.cpp:304 src/gui/popupmenu.cpp:140
+#: src/gui/botcheckerwindow.cpp:302 src/gui/popupmenu.cpp:140
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:550
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "Attack"
 msgstr "攻击"
 
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:209
+#: src/gui/botcheckerwindow.cpp:303 src/gui/popupmenu.cpp:209
 #: src/gui/setupactiondata.h:86
 msgid "Talk"
 msgstr "说话"
 
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:200
+#: src/gui/botcheckerwindow.cpp:304 src/gui/popupmenu.cpp:200
 #: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:335
 #: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:561
 #: src/gui/popupmenu.cpp:628 src/gui/setupactiondata.h:1565
 msgid "Move"
 msgstr "移动"
 
-#: src/gui/botcheckerwindow.cpp:307
+#: src/gui/botcheckerwindow.cpp:305
 msgid "Result"
 msgstr "结果"
 
@@ -455,13 +455,13 @@ msgid "???"
 msgstr "？？？"
 
 #: src/gui/buydialog.cpp:186 src/gui/buydialog.cpp:197
-#: src/gui/buydialog.cpp:247 src/gui/buyselldialog.cpp:65
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:2272
+#: src/gui/buydialog.cpp:247 src/gui/buyselldialog.cpp:64
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:2271
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buydialog.cpp:230 src/gui/buydialog.cpp:504
-#: src/gui/selldialog.cpp:92 src/gui/selldialog.cpp:334
+#: src/gui/buydialog.cpp:230 src/gui/buydialog.cpp:505
+#: src/gui/selldialog.cpp:91 src/gui/selldialog.cpp:333
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
@@ -474,7 +474,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:243 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:236 src/gui/npcdialog.cpp:82
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:811
+#: src/gui/selldialog.cpp:94 src/gui/statuswindow.cpp:811
 msgid "+"
 msgstr "+"
 
@@ -482,18 +482,18 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:246 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:83
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:823
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:823
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:248 src/gui/quitdialog.cpp:53
 #: src/gui/quitdialog.cpp:56 src/gui/quitdialog.cpp:57
-#: src/gui/selldialog.cpp:98 src/gui/serverdialog.cpp:252
+#: src/gui/selldialog.cpp:97 src/gui/serverdialog.cpp:252
 #: src/gui/setupactiondata.h:156
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buydialog.cpp:249 src/gui/selldialog.cpp:99
+#: src/gui/buydialog.cpp:249 src/gui/selldialog.cpp:98
 #: src/gui/statuswindow.cpp:539 src/gui/statuswindow.cpp:595
 #: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:837
 msgid "Max"
@@ -505,13 +505,13 @@ msgstr "最大"
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:211
-#: src/gui/popupmenu.cpp:2273 src/gui/selldialog.cpp:51
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
+#: src/gui/buyselldialog.cpp:64 src/gui/popupmenu.cpp:211
+#: src/gui/popupmenu.cpp:2272 src/gui/selldialog.cpp:51
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:96
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:52
+#: src/gui/buyselldialog.cpp:64 src/gui/changeemaildialog.cpp:52
 #: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
 #: src/gui/itemamountwindow.cpp:208 src/gui/npcpostdialog.cpp:60
@@ -520,13 +520,13 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:491
 #: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:660
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1785
-#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1905
-#: src/gui/popupmenu.cpp:1942 src/gui/popupmenu.cpp:2003
-#: src/gui/popupmenu.cpp:2056 src/gui/popupmenu.cpp:2080
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2119
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2160
-#: src/gui/popupmenu.cpp:2343 src/gui/quitdialog.cpp:64
+#: src/gui/popupmenu.cpp:1756 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:2002
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2079
+#: src/gui/popupmenu.cpp:2102 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2342 src/gui/quitdialog.cpp:64
 #: src/gui/registerdialog.cpp:75 src/gui/setupactiondata.h:1513
 #: src/gui/setup.cpp:78 src/gui/socialwindow.cpp:1187
 #: src/gui/textcommandeditor.cpp:191 src/gui/textdialog.cpp:51
@@ -547,17 +547,17 @@ msgstr "帐号：%s"
 msgid "Type new email address twice:"
 msgstr "两次新的电子邮件地址："
 
-#: src/gui/changeemaildialog.cpp:135
+#: src/gui/changeemaildialog.cpp:134
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:142
+#: src/gui/changeemaildialog.cpp:141
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:149
+#: src/gui/changeemaildialog.cpp:148
 msgid "The email address entries mismatch."
 msgstr "电子邮件地址不匹配。"
 
@@ -808,9 +808,9 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2205
-#: src/gui/popupmenu.cpp:2213 src/gui/popupmenu.cpp:2222
-#: src/gui/popupmenu.cpp:2241
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2204
+#: src/gui/popupmenu.cpp:2212 src/gui/popupmenu.cpp:2221
+#: src/gui/popupmenu.cpp:2240
 msgid "Ignore"
 msgstr "忽略"
 
@@ -1040,7 +1040,7 @@ msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
 #: src/gui/inventorywindow.cpp:597 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1869
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -1053,31 +1053,31 @@ msgid "Did you know..."
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:127 src/gui/windowmenu.cpp:100
-#: src/inventory.cpp:259
+#: src/inventory.cpp:253
 msgid "Inventory"
 msgstr "物品栏"
 
 #: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:599
 #: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1871
 msgid "Equip"
 msgstr "装备"
 
 #: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:603
-#: src/gui/popupmenu.cpp:1718 src/gui/popupmenu.cpp:1783
-#: src/gui/popupmenu.cpp:1820 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1718 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1875
 #: src/gui/skilldialog.cpp:268
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1825
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1824
+#: src/gui/popupmenu.cpp:1880
 msgid "Drop..."
 msgstr "掉落... ..."
 
 #: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1834 src/gui/popupmenu.cpp:1890
+#: src/gui/popupmenu.cpp:1833 src/gui/popupmenu.cpp:1889
 msgid "Split"
 msgstr "分离"
 
@@ -1088,17 +1088,17 @@ msgid "Outfits"
 msgstr "套装"
 
 #: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:690
-#: src/gui/popupmenu.cpp:1697 src/gui/popupmenu.cpp:1837
-#: src/gui/popupmenu.cpp:1893 src/gui/setup.cpp:79
+#: src/gui/popupmenu.cpp:1697 src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1892 src/gui/setup.cpp:79
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1739
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1738
 msgid "Retrieve"
 msgstr "取回"
 
 #: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1728
-#: src/gui/popupmenu.cpp:1830 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1829 src/gui/popupmenu.cpp:1885
 #: src/gui/windowmenu.cpp:132
 msgid "Drop"
 msgstr "丢弃"
@@ -1432,7 +1432,7 @@ msgid "Nuke"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:2313
+#: src/gui/popupmenu.cpp:2312
 msgid "Add comment"
 msgstr "发表评论"
 
@@ -1452,7 +1452,7 @@ msgstr "优先攻击列表"
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
-#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:2328
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:2327
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1465,7 +1465,7 @@ msgid "Players"
 msgstr "玩家"
 
 #: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:2303
+#: src/gui/popupmenu.cpp:2302
 msgid "Kick from party"
 msgstr "踢从党"
 
@@ -1473,8 +1473,8 @@ msgstr "踢从党"
 msgid "Pick up"
 msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:1755
-#: src/gui/popupmenu.cpp:1838 src/gui/popupmenu.cpp:1894
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
 msgid "Add to chat"
 msgstr "加入聊天"
 
@@ -1486,8 +1486,8 @@ msgstr "地图项"
 msgid "Rename"
 msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2078
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2077
 msgid "Remove"
 msgstr ""
 
@@ -1539,11 +1539,11 @@ msgstr ""
 msgid "Leave"
 msgstr "留下"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:2133
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:572 src/gui/popupmenu.cpp:2301
+#: src/gui/popupmenu.cpp:572 src/gui/popupmenu.cpp:2300
 msgid "Invite to party"
 msgstr ""
 
@@ -1606,143 +1606,143 @@ msgstr ""
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1724 src/gui/popupmenu.cpp:1826
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1724 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881
 msgid "Drop all"
 msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1742
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1743
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1744
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1745
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1903
+#: src/gui/popupmenu.cpp:1902
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1931 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1987
 msgid "Hide"
 msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1994
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1993
 msgid "Show"
 msgstr "显示"
 
-#: src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1999
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2002 src/gui/statuswindow.cpp:157
+#: src/gui/popupmenu.cpp:2001 src/gui/statuswindow.cpp:157
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2021 src/gui/popupmenu.cpp:2073
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
 #: src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2043
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2042
 msgid "Move up"
 msgstr "x"
 
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2045
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2044
 msgid "Move down"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/popupmenu.cpp:2312
+#: src/gui/popupmenu.cpp:2099 src/gui/popupmenu.cpp:2311
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2115
 msgid "Copy"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2117
+#: src/gui/popupmenu.cpp:2116
 msgid "Paste"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2133
+#: src/gui/popupmenu.cpp:2132
 msgid "Open link"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2147
 msgid "Show window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:2202
 msgid "Be friend"
 msgstr "是朋友"
 
-#: src/gui/popupmenu.cpp:2204 src/gui/popupmenu.cpp:2212
-#: src/gui/popupmenu.cpp:2221 src/gui/popupmenu.cpp:2240
-#: src/gui/popupmenu.cpp:2248
+#: src/gui/popupmenu.cpp:2203 src/gui/popupmenu.cpp:2211
+#: src/gui/popupmenu.cpp:2220 src/gui/popupmenu.cpp:2239
+#: src/gui/popupmenu.cpp:2247
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2206 src/gui/popupmenu.cpp:2214
-#: src/gui/popupmenu.cpp:2242
+#: src/gui/popupmenu.cpp:2205 src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2241
 msgid "Black list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2215
-#: src/gui/popupmenu.cpp:2223
+#: src/gui/popupmenu.cpp:2206 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2222
 msgid "Set as enemy"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2216
-#: src/gui/popupmenu.cpp:2224 src/gui/popupmenu.cpp:2230
-#: src/gui/popupmenu.cpp:2235 src/gui/popupmenu.cpp:2243
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:2223 src/gui/popupmenu.cpp:2229
+#: src/gui/popupmenu.cpp:2234 src/gui/popupmenu.cpp:2242
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2220 src/gui/popupmenu.cpp:2228
-#: src/gui/popupmenu.cpp:2234 src/gui/popupmenu.cpp:2239
-#: src/gui/popupmenu.cpp:2247
+#: src/gui/popupmenu.cpp:2219 src/gui/popupmenu.cpp:2227
+#: src/gui/popupmenu.cpp:2233 src/gui/popupmenu.cpp:2238
+#: src/gui/popupmenu.cpp:2246
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2229 src/gui/popupmenu.cpp:2249
+#: src/gui/popupmenu.cpp:2228 src/gui/popupmenu.cpp:2248
 #: src/playerrelations.cpp:461
 msgid "Completely ignore"
 msgstr "完全忽略"
 
-#: src/gui/popupmenu.cpp:2259
+#: src/gui/popupmenu.cpp:2258
 msgid "Follow"
 msgstr "按照"
 
-#: src/gui/popupmenu.cpp:2260
+#: src/gui/popupmenu.cpp:2259
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2278 src/gui/popupmenu.cpp:2289
+#: src/gui/popupmenu.cpp:2277 src/gui/popupmenu.cpp:2288
 msgid "Buy (?)"
 msgstr "购买(?)"
 
-#: src/gui/popupmenu.cpp:2279 src/gui/popupmenu.cpp:2290
+#: src/gui/popupmenu.cpp:2278 src/gui/popupmenu.cpp:2289
 msgid "Sell (?)"
 msgstr "出售(?)"
 
-#: src/gui/popupmenu.cpp:2311
+#: src/gui/popupmenu.cpp:2310
 msgid "Show Items"
 msgstr "显示项目"
 
-#: src/gui/popupmenu.cpp:2322
+#: src/gui/popupmenu.cpp:2321
 msgid "Remove from pickup list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2326
+#: src/gui/popupmenu.cpp:2325
 msgid "Add to pickup list"
 msgstr ""
 
@@ -1803,8 +1803,8 @@ msgstr "选择您的服务器"
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/serverdialog.cpp:255 src/gui/widgets/setupitem.cpp:295
-#: src/gui/widgets/setupitem.cpp:421
+#: src/gui/serverdialog.cpp:255 src/gui/widgets/setupitem.cpp:294
+#: src/gui/widgets/setupitem.cpp:420
 msgid "Edit"
 msgstr "编辑"
 
@@ -1837,11 +1837,11 @@ msgstr "准备下载"
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误！"
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:607
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
-#: src/gui/serverdialog.cpp:608
+#: src/gui/serverdialog.cpp:609
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -3715,11 +3715,11 @@ msgstr "显示在公布的联系"
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:103
+#: src/gui/shopwindow.cpp:763 src/net/ea/tradehandler.cpp:103
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/shopwindow.cpp:765
+#: src/gui/shopwindow.cpp:763
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗？"
@@ -4130,11 +4130,11 @@ msgstr "改变"
 msgid "You give:"
 msgstr "你给予："
 
-#: src/gui/tradewindow.cpp:383
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
-#: src/gui/tradewindow.cpp:464
+#: src/gui/tradewindow.cpp:460
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
@@ -4363,12 +4363,12 @@ msgstr "%s 全局公告："
 msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
-#: src/gui/widgets/chattab.cpp:525
+#: src/gui/widgets/chattab.cpp:524
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:527
+#: src/gui/widgets/chattab.cpp:526
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4612,37 +4612,37 @@ msgstr ""
 msgid "Choose World"
 msgstr "选择世界"
 
-#: src/inputmanager.cpp:323 src/inputmanager.cpp:362 src/keyboardconfig.cpp:86
+#: src/inputmanager.cpp:322 src/inputmanager.cpp:361 src/keyboardconfig.cpp:86
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: this is long joystick button name
-#: src/inputmanager.cpp:328
+#: src/inputmanager.cpp:327
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
-#: src/inputmanager.cpp:340
+#: src/inputmanager.cpp:339
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: this is short joystick button name
-#: src/inputmanager.cpp:368
+#: src/inputmanager.cpp:367
 #, c-format
 msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:380 src/keyboardconfig.cpp:98
+#: src/inputmanager.cpp:379 src/keyboardconfig.cpp:98
 msgid "u key"
 msgstr ""
 
-#: src/inventory.cpp:261
+#: src/inventory.cpp:255
 msgid "Storage"
 msgstr "仓库"
 
-#: src/inventory.cpp:263
+#: src/inventory.cpp:257
 msgid "Cart"
 msgstr ""
 
@@ -4687,304 +4687,304 @@ msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:1624 src/localplayer.cpp:1658 src/localplayer.cpp:1659
+#: src/localplayer.cpp:1623 src/localplayer.cpp:1657 src/localplayer.cpp:1658
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1664 src/localplayer.cpp:1671 src/localplayer.cpp:1678
+#: src/localplayer.cpp:1663 src/localplayer.cpp:1670 src/localplayer.cpp:1677
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1860
+#: src/localplayer.cpp:1859
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1861
+#: src/localplayer.cpp:1860
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1862
+#: src/localplayer.cpp:1861
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1863
+#: src/localplayer.cpp:1862
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1864
+#: src/localplayer.cpp:1863
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1865
+#: src/localplayer.cpp:1864
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1887
+#: src/localplayer.cpp:1886
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1891
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1895
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1910
+#: src/localplayer.cpp:1909
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1910
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1911
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1912
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1913
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1914
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1915
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1917
+#: src/localplayer.cpp:1916
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1918
+#: src/localplayer.cpp:1917
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
-#: src/localplayer.cpp:1919
+#: src/localplayer.cpp:1918
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1937
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1938
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1940
+#: src/localplayer.cpp:1939
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1940
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1941
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1961 src/localplayer.cpp:1965 src/localplayer.cpp:1988
+#: src/localplayer.cpp:1960 src/localplayer.cpp:1964 src/localplayer.cpp:1987
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/localplayer.cpp:1962 src/localplayer.cpp:1984
+#: src/localplayer.cpp:1961 src/localplayer.cpp:1983
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1962
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1963
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:1985
+#: src/localplayer.cpp:1984
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/localplayer.cpp:1986
+#: src/localplayer.cpp:1985
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:1987
+#: src/localplayer.cpp:1986
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2039
+#: src/localplayer.cpp:2038
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2040
+#: src/localplayer.cpp:2039
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2041
+#: src/localplayer.cpp:2040
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2042
+#: src/localplayer.cpp:2041
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2043
+#: src/localplayer.cpp:2042
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2044
+#: src/localplayer.cpp:2043
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2045
+#: src/localplayer.cpp:2044
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2046
+#: src/localplayer.cpp:2045
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2058
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2059
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2060
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2061
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2062
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2063
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2082
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2083
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2084
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2085
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2086
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2087
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2106
 msgid "(a) attack all players"
 msgstr "(a) 攻击所有玩家"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2107
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2108
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2109
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2110
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2129
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2131
+#: src/localplayer.cpp:2130
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2131
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2160
+#: src/localplayer.cpp:2159
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:2182
+#: src/localplayer.cpp:2181
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2182
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2184 src/localplayer.cpp:2199
+#: src/localplayer.cpp:2183 src/localplayer.cpp:2198
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2197
+#: src/localplayer.cpp:2196
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2197
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2222
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2224
+#: src/localplayer.cpp:2223
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2225
+#: src/localplayer.cpp:2224
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3767
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3784
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3776
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3778 src/localplayer.cpp:3786
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4132
+#: src/localplayer.cpp:4127
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -5125,7 +5125,7 @@ msgstr ""
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "创建角色失败。很可能名称已被占用。"
 
-#: src/net/ea/charserverhandler.cpp:159 src/net/ea/loginhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:159 src/net/ea/loginhandler.cpp:262
 msgid "Wrong name."
 msgstr "错误的名称。"
 
@@ -5328,48 +5328,48 @@ msgstr "经验共享不可能。"
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account was not found. Please re-login."
 msgstr "帐号不存在。请重新登录。"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:151
 msgid "Old password incorrect."
 msgstr "旧密码不正确。"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:154
 msgid "New password too short."
 msgstr "新密码太短。"
 
-#: src/net/ea/loginhandler.cpp:158 src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:157 src/net/ea/loginhandler.cpp:271
 msgid "Unknown error."
 msgstr "未知的错误。"
 
-#: src/net/ea/loginhandler.cpp:230
+#: src/net/ea/loginhandler.cpp:229
 msgid "Unregistered ID."
 msgstr "未注册的ID。"
 
-#: src/net/ea/loginhandler.cpp:233
+#: src/net/ea/loginhandler.cpp:232
 msgid "Wrong password."
 msgstr "错误的密码。"
 
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:236
 msgid "Account expired."
 msgstr "账户过期失效。"
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:239
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:242
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "您已被永久禁止进入游戏。请联系GM团队。"
 
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:246
 msgid "Client too old."
 msgstr "客户端太旧。"
 
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:249
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -5378,19 +5378,19 @@ msgstr ""
 "你被暂时禁止进入游戏直到%s.\n"
 "请通过论坛联系GM组"
 
-#: src/net/ea/loginhandler.cpp:257
+#: src/net/ea/loginhandler.cpp:256
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:259
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:266
+#: src/net/ea/loginhandler.cpp:265
 msgid "Incorrect email."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:269
+#: src/net/ea/loginhandler.cpp:268
 msgid "Username permanently erased."
 msgstr ""
 
@@ -5523,17 +5523,17 @@ msgstr ""
 "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
 "\"false\"用来禁止物品共享。"
 
-#: src/net/ea/playerhandler.cpp:334 src/net/ea/playerhandler.cpp:344
-#: src/net/ea/playerhandler.cpp:426
+#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
+#: src/net/ea/playerhandler.cpp:427
 msgid "Message"
 msgstr "讯息"
 
-#: src/net/ea/playerhandler.cpp:335
+#: src/net/ea/playerhandler.cpp:336
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）"
 
-#: src/net/ea/playerhandler.cpp:345
+#: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5675,74 +5675,74 @@ msgstr "重复登录。"
 msgid "Unknown connection error."
 msgstr "未知的连接错误。"
 
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:235
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:234
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接"
 
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:261
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
 msgid "Strength"
 msgstr "力量"
 
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:262
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:261
 msgid "Agility"
 msgstr "敏捷"
 
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:263
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:262
 msgid "Vitality"
 msgstr "生命"
 
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:264
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
 msgid "Intelligence"
 msgstr "智慧"
 
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:265
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:264
 msgid "Dexterity"
 msgstr "敏捷"
 
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:265
 msgid "Luck"
 msgstr "幸运"
 
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
 msgid "Defense"
 msgstr "防御"
 
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:270
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:269
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:276
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:277
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:278
 msgid "Walk Delay"
 msgstr "步行延迟"
 
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:279
 msgid "Attack Range"
 msgstr "攻击范围"
 
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:280
 msgid "Damage per sec."
 msgstr "每秒伤害"