Merge branch 'master' into strippedstripped1.1.10.2

Conflicts:
	packaging/debian/watch

1 files changed, 339 insertions, 299 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9170e805f..2c7dcc85f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:12+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "team/zh_CN/)\n"
@@ -20,25 +20,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "在地图上可见"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "小姐"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr "I"
 
@@ -46,43 +46,43 @@ msgstr "I"
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Perfomance"
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "连接到服务器"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "登录"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "请求字符"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -92,50 +92,50 @@ msgstr "更改游戏服务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "申请登记的详细信息"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "密码成功！"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "电子邮件变更"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "电子邮件已变更成功！"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "永别了，任何时候回来... ..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -328,19 +328,19 @@ msgstr "服务器的连接丢失。"
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -375,7 +375,7 @@ msgstr "姓名"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "攻击"
 
@@ -398,44 +398,48 @@ msgstr "结果"
 msgid "Reset"
 msgstr "重置"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "最大"
 
@@ -464,7 +468,7 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -633,8 +637,8 @@ msgid "Enter password:"
 msgstr "输入密码："
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "删除"
 
@@ -886,7 +890,7 @@ msgid "Did You Know?"
 msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "关闭"
@@ -913,7 +917,7 @@ msgid "Equipment"
 msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -943,37 +947,33 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "物品栏"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "槽："
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "过滤器："
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "排序："
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -993,17 +993,17 @@ msgstr "装具"
 msgid "Weight:"
 msgstr "重量："
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2192,30 +2192,34 @@ msgid "Show own name"
 msgstr "显示自己的名字"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "目标死球员"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "可见姓名"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr "显示状态"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr ""
 
@@ -2243,23 +2247,23 @@ msgstr "忽略"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "允许密语"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "旧"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr "关系"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "当忽略时："
 
@@ -3042,130 +3046,130 @@ msgstr "级别:%d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3226,30 +3230,34 @@ msgid "Command:"
 msgstr "命令："
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "法力："
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "目标类型："
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "图示："
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "魔法等级："
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "魔法学院："
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "学校层次："
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "保存"
 
@@ -3477,23 +3485,23 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "更新"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -3773,455 +3781,487 @@ msgid "Cart"
 msgstr ""
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "向上移动"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "向下移动"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "向左移动"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "向右移动"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "对准并攻击"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "移动到目标"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr "更改移动到目标类型"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr "移动到首页位置"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr "设为首页位置"
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr "移动导航点"
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "笑脸"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "停止攻击"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "目标最接近"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "目标NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "目标玩家"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "捡起"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr "更改皮卡型"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "隐藏窗口"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "屏幕快照"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr "更改地图浏览模式"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
+msgid "Select OK"
+msgstr "选择OK"
+
+#: src/keyboardconfig.cpp:85
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr "项目的快捷方式键"
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品快捷 %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:128
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "帮助窗口"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "状态窗口"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "物品栏窗口"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "装备窗口"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "技能窗口"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "小地图窗口"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "聊天窗口"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "物品快捷窗口"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "设置窗口"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Debug窗口"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "社会窗口"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "表情快捷窗口"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "装具窗口"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr "橱窗"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr "快速下拉窗口"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr "杀敌统计窗口"
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr "命令的窗口"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr "BOT检查窗口"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "谁是在线窗口"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr "上一页社会标签"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:175
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:176
+msgid "Smilie"
+msgstr "笑脸"
+
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
 #: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
 #: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快捷键为 %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:270
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:277
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr "关闭当前聊天标签"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr "自动完成交谈"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr "停用聊天输入"
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "选择OK"
+#: src/keyboardconfig.cpp:299
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr "直接向上"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr "直接下"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr "直接离开"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr "直接对"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr "快速下降序号项目"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr "快速愈合的目标或自我"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "使用魔法攻击"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr "切换魔法攻击"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr "更改移动类型"
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr "更改攻击型武器"
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr "更改攻击类型"
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr "更改跟随模式"
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr "更改仿模式"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "开/关 音频"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr "启用/禁用离开模式"
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr "从键盘模拟右键单击"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr "切换模式"
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr "你被打死"
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1441
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1465
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:3168
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "你看"
 
@@ -4606,15 +4646,15 @@ msgstr "命令：/exp"
 msgid "This command displays the party's current experience sharing policy."
 msgstr "该命令显示帮会现有的经验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "物品共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr "物品共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "物品共享不可能。"
 
@@ -4622,15 +4662,15 @@ msgstr "物品共享不可能。"
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "经验共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能。"
 
@@ -4711,54 +4751,54 @@ msgstr ""
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "无法创建帮会。"
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "帮会创建成功。"
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s已经加入你的党。"
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s已经是你的帮会成员了。"
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s拒绝了您的邀请。"
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s现在是你帮会中的成员了。"
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s不能加入团队，因为团队成员已满。"
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "你以退出帮会"
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已经离开你的帮会。"
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知成员尝试说：%s"
@@ -4912,83 +4952,83 @@ msgstr "不能提升技能!"
 msgid "Equip arrows first."
 msgstr "请先装备弓箭。"
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "交易失败！"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "发送表情失败！"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "原地休息失败！"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "聊天创建失败！"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "不能加入工会！"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr "无法呼喊！"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级！"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr "没有备忘录"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "你无法办到！"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币…… ;-)"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能！"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石！"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石！"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到！"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr "啊？那是什么？"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr "传送失败..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr "毒药无效..."