1 files changed, 309 insertions, 264 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 30b463d6d..71de904c1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr ""
 
@@ -40,15 +40,15 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -68,46 +68,58 @@ msgstr "确定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr ""
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "无法偷取任何物品..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "对%s密语到：%s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -276,7 +288,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -295,12 +307,12 @@ msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -311,53 +323,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "项目是太重了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "物品太远了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -365,53 +377,53 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -421,8 +433,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -464,7 +476,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "视频"
 
@@ -511,7 +523,7 @@ msgstr "帮助"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
@@ -740,7 +752,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出."
@@ -762,6 +773,12 @@ msgstr "创建更新目录错误!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s 不存在，且无法创建！正在退出."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -779,36 +796,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1216,7 +1233,7 @@ msgstr "讯息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1400,8 +1417,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1733,14 +1750,14 @@ msgstr "建立"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1880,11 +1897,11 @@ msgstr "说话"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "购买"
 
@@ -1898,10 +1915,10 @@ msgstr "购买"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "出售"
@@ -1911,7 +1928,7 @@ msgstr "出售"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "发表评论"
 
@@ -1937,7 +1954,7 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr ""
 
@@ -2021,8 +2038,8 @@ msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "踢从党"
 
@@ -2035,7 +2052,7 @@ msgstr "拾取"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "加入聊天"
 
@@ -2050,8 +2067,8 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr ""
 
@@ -2059,7 +2076,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr ""
 
@@ -2101,7 +2118,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "清除"
 
@@ -2154,8 +2171,8 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2241,9 +2258,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "存储"
 
@@ -2316,9 +2333,9 @@ msgstr "检索所有"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2326,46 +2343,46 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2373,30 +2390,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2404,7 +2421,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2413,135 +2430,135 @@ msgstr "等级：%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "所有"
 
@@ -2549,67 +2566,67 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2676,7 +2693,7 @@ msgstr "聊天"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2963,19 +2980,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr ""
 
@@ -2986,7 +3003,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3002,7 +3019,7 @@ msgstr "添加"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "退出"
 
@@ -3014,7 +3031,7 @@ msgstr "退出"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3026,7 +3043,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3998,30 +4015,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "启用攻击过滤器"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "时间"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "使用本地时间"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4030,12 +4053,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4044,12 +4067,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4060,12 +4083,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4533,7 +4556,7 @@ msgstr "启用商店模式"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4912,21 +4935,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5064,8 +5092,8 @@ msgstr "主题更改"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效."
 
@@ -5146,109 +5174,109 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "全屏"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "FPS限制:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr ""
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "w"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切换到窗口模式，并恢复旧的模式，也没有失败!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:                 "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -6101,25 +6129,36 @@ msgid "Enter password:"
 msgstr "输入密码:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "移动"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6282,12 +6321,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6491,7 +6530,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6651,22 +6690,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "下一个"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "提交"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "重置"
 
@@ -6834,7 +6873,7 @@ msgid "Reset Windows"
 msgstr "重置窗口"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "个人商店"
 
@@ -6866,40 +6905,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "请求交易"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6934,13 +6973,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7261,7 +7300,7 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -7276,12 +7315,12 @@ msgid "Who Is Online - "
 msgstr "谁在线 - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -7303,25 +7342,25 @@ msgstr "选择世界"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7329,7 +7368,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -7410,91 +7449,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "目标公会:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "其他按键"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "捡起"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "更改皮卡型"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "坐下"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "屏幕快照"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "更改地图浏览模式"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "选择OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9068,103 +9113,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10383,56 +10428,56 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr ""