1 files changed, 227 insertions, 205 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ade28fe2..e159fa701 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 #
-#   <colorfullife81@gmail.com>, 2011.
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
+#   <colorfullife81@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 15:29+0000\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"PO-Revision-Date: 2011-09-09 22:37+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "team/zh_CN/)\n"
@@ -19,25 +20,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
 msgid "Visible on map"
 msgstr "在地图上可见"
 
-#: src/being.cpp:549
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:549
+#: src/being.cpp:551
 msgid "miss"
 msgstr "小姐"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
 msgid "I"
 msgstr "I"
 
@@ -107,22 +108,22 @@ msgstr "注销成功"
 msgid "Farewell, come back any time..."
 msgstr "永别了，任何时候回来... ..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1633
+#: src/client.cpp:1635
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1694
+#: src/client.cpp:1696
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -315,19 +316,19 @@ msgstr "服务器的连接丢失。"
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1236
+#: src/game.cpp:1243
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1250
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1629
+#: src/game.cpp:1636
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1630
+#: src/game.cpp:1637
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -356,31 +357,31 @@ msgstr "评论: %s"
 msgid "Bot Checker"
 msgstr "机器人检查"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "姓名"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "攻击"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "说话"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
 #: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
 msgid "Move"
 msgstr "移动"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "结果"
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
 msgid "Reset"
 msgstr "重置"
 
@@ -426,7 +427,7 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
 msgid "Shop"
 msgstr "商店"
 
@@ -445,10 +446,10 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
 #: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
 #: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
 #: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -550,7 +551,7 @@ msgstr "发型："
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "建立"
@@ -618,26 +619,26 @@ msgstr "删除字符输入的密码"
 msgid "Enter password:"
 msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: 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
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
 msgid "Choose"
 msgstr "选择"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 #, c-format
 msgid "Level %d"
 msgstr "等级 %d"
 
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
 msgid "(empty)"
 msgstr "()"
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
 msgid "default"
 msgstr "默认"
 
@@ -693,11 +694,12 @@ msgstr "彩虹2"
 msgid "rainbow 3"
 msgstr "彩虹3"
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "？？？"
 
@@ -730,7 +732,7 @@ msgstr "否"
 msgid "Ignore"
 msgstr "忽略"
 
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
 #: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "地图"
@@ -871,7 +873,7 @@ msgid "Did You Know?"
 msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "关闭"
@@ -897,10 +899,10 @@ msgstr "确定"
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -908,80 +910,88 @@ msgstr "卸下装备"
 msgid "Help"
 msgstr "帮助"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "物品栏"
 
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
 msgid "Slots:"
 msgstr "槽："
 
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
 msgid "Filter:"
 msgstr "过滤器："
 
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
 msgid "Sort:"
 msgstr "排序："
 
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "na"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "az"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "id"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
 msgid "Drop..."
 msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
 #: src/gui/popupmenu.cpp:549
 msgid "Outfits"
 msgstr "装具"
 
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "重量："
 
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丢弃"
@@ -1035,89 +1045,89 @@ msgstr "重量：%s"
 msgid "Kill stats"
 msgstr "杀敌统计"
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "复位统计"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "复位定时器"
 
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "等级:%d 在 %f%%"
 
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "最后EXP："
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr "你已经离开工会."
 
@@ -1215,7 +1225,7 @@ msgid "Submit"
 msgstr "提交"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
@@ -1303,7 +1313,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
 #: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -1354,7 +1364,7 @@ msgid "Show Items"
 msgstr "显示项目"
 
 #: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
 msgid "Undress"
 msgstr ""
 
@@ -1402,8 +1412,8 @@ msgstr ""
 msgid "Pick up"
 msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
 msgid "Add to chat"
 msgstr "加入聊天"
 
@@ -1415,8 +1425,8 @@ msgstr "地图项"
 msgid "Rename"
 msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
 msgid "Remove"
 msgstr ""
 
@@ -1492,85 +1502,85 @@ msgstr "玩家评论"
 msgid "Comment:                      "
 msgstr "评论："
 
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
 msgid "Drop all"
 msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
 msgid "Hide"
 msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
 msgid "Show"
 msgstr "显示"
 
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
 msgid "Move up"
 msgstr "x"
 
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
 msgid "Move down"
 msgstr ""
 
@@ -1816,7 +1826,7 @@ msgstr "时间"
 msgid "Use local time"
 msgstr "使用本地时间"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
 msgid "Other"
 msgstr "其他"
 
@@ -1979,115 +1989,127 @@ msgstr "绘制路径"
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
+msgstr ""
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
 msgid "Moving"
 msgstr "移动"
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:99
 msgid "Auto fix position"
 msgstr "自动修复的位置"
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
 msgid "Attack while moving"
 msgstr "攻击的同时移动"
 
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
 msgid "Sync player move"
 msgstr "同步播放移动"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
 msgid "Crazy move A program"
 msgstr "疯狂的举动的程序"
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
 msgid "Show own hp bar"
 msgstr "显示自己的HP栏"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
 msgid "Enable quick stats"
 msgstr "启用快速统计"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
 msgid "Show job exp messages"
 msgstr "显示工作EXP消息"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
 msgid "Show players popups"
 msgstr "显示球员弹出窗口"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
 msgid "Show job"
 msgstr "显示工作"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
 msgid "Enable attack filter"
 msgstr "启用攻击过滤器"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
 msgid "Accept sell/buy requests"
 msgstr "接受出售/购买请求"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
 msgid "Enable shop mode"
 msgstr "启用店模式"
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
 msgid "Enable bot checker"
 msgstr "启用BOT检查"
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection"
 msgstr "启用BUG保护"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "显示背景"
 
@@ -2104,29 +2126,29 @@ msgid "Auto adjust perfomance"
 msgstr "自动调整"
 
 #: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
 msgid "Hw acceleration"
 msgstr "硬件加速"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr ""
+
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
 msgstr ""
@@ -2379,7 +2401,7 @@ msgid "FPS limit:"
 msgstr "FPS限制："
 
 #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -2405,7 +2427,7 @@ msgstr "l"
 
 #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
 msgid "None"
 msgstr "w"
 
@@ -2511,22 +2533,22 @@ msgstr "升级"
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
 
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "等级: %d（%+d）"
@@ -3449,23 +3471,23 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
 msgid "Update"
 msgstr "更新"
 
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -4133,67 +4155,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "你被打死"
 
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
 #, 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:3173
+#: src/localplayer.cpp:3187
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
 msgid "You see "
 msgstr "你看"
 
@@ -4394,16 +4416,16 @@ msgstr "MVP球员。"
 msgid "MVP player: "
 msgstr "MVP球员："
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
 #, c-format
 msgid "Online users: %d"
 msgstr "在线用户数：%d"
 
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
 msgid "Game"
 msgstr "游戏"
 
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -5451,19 +5473,19 @@ msgstr "连接到服务器终止。"
 msgid "%s is not in your party!"
 msgstr "%s不在你的帮会中！"
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
 msgid "Floating bubble"
 msgstr "流动的泡沫"